Skip to content

Y
ygopro-core
Commit 78f33bcf authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch '233/patch-return-to-field' into develop

parents 3057f6d8 4f1928d9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
operations.cpp
View file @ 78f33bcf
...@@ -4646,9 +4646,9 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret, ...@@ -4646,9 +4646,9 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
target->reset(resetflag, RESET_EVENT); target->reset(resetflag, RESET_EVENT);
target->clear_card_target(); target->clear_card_target();
} }
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
} }
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
if(ret == 1) if(ret == 1)
target->current.reason &= ~REASON_TEMPORARY; target->current.reason &= ~REASON_TEMPORARY;
if(ret == 0 && location != target->current.location if(ret == 0 && location != target->current.location
......
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