Skip to content

Y
ygopro-core
Commit cf416043 authored by DailyShana's avatar DailyShana
Browse files
Options

reset STATUS_*_TURN when move to field(not return)

parent 435e0dd7
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
operations.cpp
View file @ cf416043
...@@ -4279,15 +4279,14 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret, ...@@ -4279,15 +4279,14 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
} }
if(!(target->current.location & LOCATION_ONFIELD)) if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect(); target->clear_relate_effect();
} else { }
if(target->turnid != infos.turn_id) { if(ret != 1 || target->turnid != infos.turn_id) {
target->set_status(STATUS_SUMMON_TURN, FALSE); target->set_status(STATUS_SUMMON_TURN, FALSE);
target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE); target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE);
target->set_status(STATUS_SPSUMMON_TURN, FALSE); target->set_status(STATUS_SPSUMMON_TURN, FALSE);
target->set_status(STATUS_SET_TURN, FALSE); target->set_status(STATUS_SET_TURN, FALSE);
target->set_status(STATUS_FORM_CHANGED, FALSE); target->set_status(STATUS_FORM_CHANGED, FALSE);
} }
}
target->temp.sequence = seq; target->temp.sequence = seq;
if(location != LOCATION_MZONE) { if(location != LOCATION_MZONE) {
returns.ivalue[0] = positions; returns.ivalue[0] = positions;
......
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