Skip to content

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

fix reset control

parent 1db16596
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
processor.cpp
View file @ a3479dc7
...@@ -1368,8 +1368,8 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1368,8 +1368,8 @@ int32 field::process_phase_event(int16 step, int32 phase) {
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
cn_count++; cn_count++;
} }
for(auto eit = effects.pheff.begin(); eit != effects.pheff.end(); ++eit) { for(auto eit = effects.pheff.begin(); eit != effects.pheff.end();) {
peffect = *eit; peffect = *eit++;
if(peffect->code != EFFECT_SET_CONTROL) if(peffect->code != EFFECT_SET_CONTROL)
continue; continue;
if(peffect->get_owner_player() != check_player) if(peffect->get_owner_player() != check_player)
...@@ -1382,6 +1382,14 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1382,6 +1382,14 @@ int32 field::process_phase_event(int16 step, int32 phase) {
continue; continue;
if((peffect->reset_count & 0xff) != 1) if((peffect->reset_count & 0xff) != 1)
continue; continue;
card* phandler = peffect->get_handler();
if(peffect->get_owner_player() != phandler->current.controler) {
if(peffect->is_flag(EFFECT_FLAG_FIELD_ONLY))
remove_effect(peffect);
else
phandler->remove_effect(peffect);
continue;
}
newchain.triggering_effect = peffect; newchain.triggering_effect = peffect;
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
cn_count++; cn_count++;
......
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