Commit 0ddfd4be authored by salix5's avatar salix5

revert: solve_continuous()

basically revert to 76e36
parent ec0026c4
......@@ -2301,13 +2301,13 @@ int32 field::process_instant_event() {
pr = effects.activate_effect.equal_range(elit->event_code);
for(; pr.first != pr.second; ++pr.first) {
peffect = pr.first->second;
if((peffect->is_flag(EFFECT_FLAG_DELAY)) && peffect->is_condition_check(peffect->handler->current.controler, *elit))
if(peffect->is_flag(EFFECT_FLAG_DELAY) && peffect->is_condition_check(peffect->handler->current.controler, *elit))
core.delayed_quick_tmp.insert(std::make_pair(peffect, *elit));
}
pr = effects.quick_o_effect.equal_range(elit->event_code);
for(; pr.first != pr.second; ++pr.first) {
peffect = pr.first->second;
if((peffect->is_flag(EFFECT_FLAG_DELAY)) && peffect->is_condition_check(peffect->handler->current.controler, *elit))
if(peffect->is_flag(EFFECT_FLAG_DELAY) && peffect->is_condition_check(peffect->handler->current.controler, *elit))
core.delayed_quick_tmp.insert(std::make_pair(peffect, *elit));
}
}
......@@ -4466,11 +4466,10 @@ int32 field::solve_continuous(uint16 step, effect * peffect, uint8 triggering_pl
if(oit->second.op_cards)
pduel->delete_group(oit->second.op_cards);
}
auto ev=core.solving_event.front();
core.continuous_chain.pop_back();
core.solving_event.pop_front();
core.conti_solving = FALSE;
if(ev.event_code != EVENT_ADJUST)
if(peffect->is_flag(EFFECT_FLAG_DELAY)) {
adjust_all();
if(core.conti_player == PLAYER_NONE)
core.conti_player = infos.turn_player;
......@@ -4501,6 +4500,7 @@ int32 field::solve_continuous(uint16 step, effect * peffect, uint8 triggering_pl
else
core.conti_player = PLAYER_NONE;
}
}
return TRUE;
}
}
......
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