Skip to content

Y
ygopro-core
Commit 29ff1257 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

update Duel.MoveToField (#439)

parent f5ff25ce
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
field.cpp
View file @ 29ff1257
...@@ -265,7 +265,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc ...@@ -265,7 +265,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc
pcard->sendto_param.position = POS_FACEDOWN_DEFENSE; pcard->sendto_param.position = POS_FACEDOWN_DEFENSE;
} }
if (pcard->current.location) { if (pcard->current.location) {
if (pcard->current.location == location) { if (pcard->current.location == location && pcard->current.pzone == !!pzone) {
if (pcard->current.location == LOCATION_DECK) { if (pcard->current.location == LOCATION_DECK) {
if(preplayer == playerid) { if(preplayer == playerid) {
pduel->write_buffer8(MSG_MOVE); pduel->write_buffer8(MSG_MOVE);
......
operations.cpp
View file @ 29ff1257
...@@ -289,7 +289,7 @@ void field::send_to(card* target, effect* reason_effect, uint32 reason, uint32 r ...@@ -289,7 +289,7 @@ void field::send_to(card* target, effect* reason_effect, uint32 reason, uint32 r
void field::move_to_field(card* target, uint32 move_player, uint32 playerid, uint32 destination, uint32 positions, uint32 enable, uint32 ret, uint32 pzone, uint32 zone) { void field::move_to_field(card* target, uint32 move_player, uint32 playerid, uint32 destination, uint32 positions, uint32 enable, uint32 ret, uint32 pzone, uint32 zone) {
if(!(destination & LOCATION_ONFIELD) || !positions) if(!(destination & LOCATION_ONFIELD) || !positions)
return; return;
if(destination == target->current.location && playerid == target->current.controler) if(destination == target->current.location && playerid == target->current.controler && target->current.pzone == !!pzone)
return; return;
target->to_field_param = (move_player << 24) + (playerid << 16) + (destination << 8) + positions; target->to_field_param = (move_player << 24) + (playerid << 16) + (destination << 8) + positions;
add_process(PROCESSOR_MOVETOFIELD, 0, 0, (group*)target, enable, ret + (pzone << 8), zone); add_process(PROCESSOR_MOVETOFIELD, 0, 0, (group*)target, enable, ret + (pzone << 8), zone);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment