Skip to content

Y
ygopro-2pick
Commit 6600c8f4 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent bd77e35e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
ocgcore/processor.cpp
View file @ 6600c8f4
...@@ -1336,6 +1336,17 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1336,6 +1336,17 @@ int32 field::process_phase_event(int16 step, int32 phase) {
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
tf_count++; tf_count++;
} }
pr = effects.continuous_effect.equal_range(phase_event);
for(; pr.first != pr.second;) {
peffect = pr.first->second;
++pr.first;
if(peffect->get_handler_player() != check_player || !peffect->is_activateable(check_player, nil_event))
continue;
peffect->id = infos.field_id++;
newchain.triggering_effect = peffect;
core.select_chains.push_back(newchain);
cn_count++;
}
core.spe_effect[check_player] = 0; core.spe_effect[check_player] = 0;
pr = effects.trigger_o_effect.equal_range(phase_event); pr = effects.trigger_o_effect.equal_range(phase_event);
for(; pr.first != pr.second; ++pr.first) { for(; pr.first != pr.second; ++pr.first) {
...@@ -1350,17 +1361,6 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1350,17 +1361,6 @@ int32 field::process_phase_event(int16 step, int32 phase) {
to_count++; to_count++;
core.spe_effect[check_player]++; core.spe_effect[check_player]++;
} }
pr = effects.continuous_effect.equal_range(phase_event);
for(; pr.first != pr.second;) {
peffect = pr.first->second;
++pr.first;
if(peffect->get_handler_player() != check_player || !peffect->is_activateable(check_player, nil_event))
continue;
peffect->id = infos.field_id++;
newchain.triggering_effect = peffect;
core.select_chains.push_back(newchain);
cn_count++;
}
if(phase == PHASE_DRAW) if(phase == PHASE_DRAW)
core.hint_timing[infos.turn_player] = TIMING_DRAW_PHASE; core.hint_timing[infos.turn_player] = TIMING_DRAW_PHASE;
else if(phase == PHASE_STANDBY) else if(phase == PHASE_STANDBY)
...@@ -1505,6 +1505,17 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1505,6 +1505,17 @@ int32 field::process_phase_event(int16 step, int32 phase) {
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
tf_count++; tf_count++;
} }
pr = effects.continuous_effect.equal_range(phase_event);
for(; pr.first != pr.second;) {
peffect = pr.first->second;
++pr.first;
if(peffect->get_handler_player() != check_player || !peffect->is_activateable(check_player, nil_event))
continue;
peffect->id = infos.field_id++;
newchain.triggering_effect = peffect;
core.select_chains.push_back(newchain);
cn_count++;
}
core.spe_effect[check_player] = 0; core.spe_effect[check_player] = 0;
pr = effects.trigger_o_effect.equal_range(phase_event); pr = effects.trigger_o_effect.equal_range(phase_event);
for(; pr.first != pr.second; ++pr.first) { for(; pr.first != pr.second; ++pr.first) {
...@@ -1519,17 +1530,6 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1519,17 +1530,6 @@ int32 field::process_phase_event(int16 step, int32 phase) {
to_count++; to_count++;
core.spe_effect[check_player]++; core.spe_effect[check_player]++;
} }
pr = effects.continuous_effect.equal_range(phase_event);
for(; pr.first != pr.second;) {
peffect = pr.first->second;
++pr.first;
if(peffect->get_handler_player() != check_player || !peffect->is_activateable(check_player, nil_event))
continue;
peffect->id = infos.field_id++;
newchain.triggering_effect = peffect;
core.select_chains.push_back(newchain);
cn_count++;
}
if(phase == PHASE_DRAW) if(phase == PHASE_DRAW)
core.hint_timing[infos.turn_player] = TIMING_DRAW_PHASE; core.hint_timing[infos.turn_player] = TIMING_DRAW_PHASE;
else if(phase == PHASE_STANDBY) else if(phase == PHASE_STANDBY)
......
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