Commit 61664cd0 authored by VanillaSalt's avatar VanillaSalt

fix

parent 48ecf560
...@@ -198,6 +198,7 @@ struct processor { ...@@ -198,6 +198,7 @@ struct processor {
card_set operated_set; card_set operated_set;
card_set discarded_set; card_set discarded_set;
card_set destroy_canceled; card_set destroy_canceled;
card_set delayed_enable_set;
card_set summoned_cards_pt[2]; card_set summoned_cards_pt[2];
card_set normalsummoned_cards_pt[2]; card_set normalsummoned_cards_pt[2];
card_set spsummoned_cards_pt[2]; card_set spsummoned_cards_pt[2];
......
...@@ -3448,9 +3448,12 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec ...@@ -3448,9 +3448,12 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
raise_single_event(pcard, 0, EVENT_FLIP, reason_effect, 0, reason_player, 0, noflip); raise_single_event(pcard, 0, EVENT_FLIP, reason_effect, 0, reason_player, 0, noflip);
flips.insert(pcard); flips.insert(pcard);
} }
if(enable) if(enable) {
pcard->enable_field_effect(TRUE); if(!reason_effect || !(reason_effect->type & 0x7f0))
else pcard->enable_field_effect(TRUE);
else
core.delayed_enable_set.insert(pcard);
} else
pcard->refresh_disable_status(); pcard->refresh_disable_status();
} }
if(pcard->current.location == LOCATION_MZONE) { if(pcard->current.location == LOCATION_MZONE) {
......
...@@ -4458,6 +4458,11 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) { ...@@ -4458,6 +4458,11 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) {
if(oit->second.op_cards) if(oit->second.op_cards)
pduel->delete_group(oit->second.op_cards); pduel->delete_group(oit->second.op_cards);
} }
for(auto cit = core.delayed_enable_set.begin(); cit != core.delayed_enable_set.end(); ++cit) {
if((*cit)->current.location == LOCATION_MZONE)
(*cit)->enable_field_effect(TRUE);
}
core.delayed_enable_set.clear();
adjust_all(); adjust_all();
core.current_chain.pop_back(); core.current_chain.pop_back();
if(!core.current_chain.size()) { if(!core.current_chain.size()) {
......
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