Skip to content

Y
ygopro-core
Commit 6818a658 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

parents 46fab452 cf416043
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
operations.cpp
View file @ 6818a658
......@@ -4332,14 +4332,13 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
}
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
} else {
if(target->turnid != infos.turn_id) {
target->set_status(STATUS_SUMMON_TURN, FALSE);
target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE);
target->set_status(STATUS_SPSUMMON_TURN, FALSE);
target->set_status(STATUS_SET_TURN, FALSE);
target->set_status(STATUS_FORM_CHANGED, FALSE);
}
}
if(ret != 1 || target->turnid != infos.turn_id) {
target->set_status(STATUS_SUMMON_TURN, FALSE);
target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE);
target->set_status(STATUS_SPSUMMON_TURN, FALSE);
target->set_status(STATUS_SET_TURN, FALSE);
target->set_status(STATUS_FORM_CHANGED, FALSE);
}
target->temp.sequence = seq;
if(location != LOCATION_MZONE) {
......@@ -4517,6 +4516,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
pcard->clear_card_target();
pcard->set_status(STATUS_SET_TURN, TRUE);
pcard->enable_field_effect(false);
pcard->previous.location = 0;
pcard->summon_info &= 0xdf00ffff;
if((pcard->summon_info & SUMMON_TYPE_PENDULUM) == SUMMON_TYPE_PENDULUM)
pcard->summon_info &= 0xf000ffff;
......
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