Commit 3b3ade97 authored by DailyShana's avatar DailyShana

rename

tmp_chains to ignition_priority_chains
parent 0dd8162d
...@@ -192,7 +192,7 @@ struct processor { ...@@ -192,7 +192,7 @@ struct processor {
event_list sub_solving_event; event_list sub_solving_event;
chain_array select_chains; chain_array select_chains;
chain_array current_chain; chain_array current_chain;
chain_array tmp_chains; chain_array ignition_priority_chains;
chain_list continuous_chain; chain_list continuous_chain;
chain_list solving_continuous; chain_list solving_continuous;
chain_list sub_solving_continuous; chain_list sub_solving_continuous;
......
...@@ -1646,7 +1646,6 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1646,7 +1646,6 @@ int32 field::process_phase_event(int16 step, int32 phase) {
} }
return TRUE; return TRUE;
} }
// core.tmp_chains: used in step 8 (obsolete ignition effect ruling)
int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_freechain, int32 skip_new) { int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_freechain, int32 skip_new) {
switch(step) { switch(step) {
case 0: { case 0: {
...@@ -1824,7 +1823,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free ...@@ -1824,7 +1823,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
newchain.triggering_effect = peffect; newchain.triggering_effect = peffect;
newchain.set_triggering_state(phandler); newchain.set_triggering_state(phandler);
newchain.triggering_player = infos.turn_player; newchain.triggering_player = infos.turn_player;
core.tmp_chains.push_back(newchain); core.ignition_priority_chains.push_back(newchain);
} }
} }
} }
...@@ -1983,8 +1982,8 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -1983,8 +1982,8 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
} }
case 2: { case 2: {
chain newchain; chain newchain;
if(core.tmp_chains.size()) if(core.ignition_priority_chains.size())
core.select_chains.swap(core.tmp_chains); core.select_chains.swap(core.ignition_priority_chains);
for(auto evit = core.point_event.begin(); evit != core.instant_event.end(); ++evit) { for(auto evit = core.point_event.begin(); evit != core.instant_event.end(); ++evit) {
if(evit == core.point_event.end()) if(evit == core.point_event.end())
evit = core.instant_event.begin(); evit = core.instant_event.begin();
......
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