Skip to content

Y
ygopro-core
Commit a37c3a0f authored by wind2009's avatar wind2009
1 Browse files
Options

Merge branch 'patch_tempremove' into develop

parents 689d6d30 65cb1c1d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
operations.cpp
View file @ a37c3a0f
...@@ -4271,10 +4271,8 @@ int32_t field::send_to(uint16_t step, group * targets, effect * reason_effect, u ...@@ -4271,10 +4271,8 @@ int32_t field::send_to(uint16_t step, group * targets, effect * reason_effect, u
if(nloc == LOCATION_GRAVE) if(nloc == LOCATION_GRAVE)
pcard->reset(RESET_TOGRAVE, RESET_EVENT); pcard->reset(RESET_TOGRAVE, RESET_EVENT);
if(nloc == LOCATION_REMOVED || ((pcard->data.type & TYPE_TOKEN) && pcard->sendto_param.location == LOCATION_REMOVED)) { if(nloc == LOCATION_REMOVED || ((pcard->data.type & TYPE_TOKEN) && pcard->sendto_param.location == LOCATION_REMOVED)) {
if(pcard->current.reason & REASON_TEMPORARY) { if(pcard->current.reason & REASON_TEMPORARY)
pcard->reset(RESET_TEMP_REMOVE, RESET_EVENT); pcard->reset(RESET_TEMP_REMOVE, RESET_EVENT);
pcard->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE);
}
else else
pcard->reset(RESET_REMOVE, RESET_EVENT); pcard->reset(RESET_REMOVE, RESET_EVENT);
} }
...@@ -4655,10 +4653,8 @@ int32_t field::move_to_field(uint16_t step, card* target, uint32_t enable, uint3 ...@@ -4655,10 +4653,8 @@ int32_t field::move_to_field(uint16_t step, card* target, uint32_t enable, uint3
target->clear_relate_effect(); target->clear_relate_effect();
if(ret == RETURN_TEMP_REMOVE_TO_FIELD) { if(ret == RETURN_TEMP_REMOVE_TO_FIELD) {
target->current.reason &= ~REASON_TEMPORARY; target->current.reason &= ~REASON_TEMPORARY;
target->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE);
} }
if(ret == 0 && location != target->current.location if(ret == 0 && location != target->current.location || ret == RETURN_TEMP_REMOVE_TO_FIELD) {
|| ret == RETURN_TEMP_REMOVE_TO_FIELD && 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);
......
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