Skip to content

Y
ygopro-core
Commit 86121c09 authored by salix5's avatar salix5
Browse files
Options

remove variable

parent 8f4e30bd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
field.h
View file @ 86121c09
...@@ -291,7 +291,6 @@ struct processor { ...@@ -291,7 +291,6 @@ struct processor {
uint32 hint_timing[2]; uint32 hint_timing[2];
uint8 current_player; uint8 current_player;
uint8 conti_player; uint8 conti_player;
int32 ctype;
std::unordered_map<uint32, std::pair<uint32, uint32> > summon_counter; std::unordered_map<uint32, std::pair<uint32, uint32> > summon_counter;
std::unordered_map<uint32, std::pair<uint32, uint32> > normalsummon_counter; std::unordered_map<uint32, std::pair<uint32, uint32> > normalsummon_counter;
std::unordered_map<uint32, std::pair<uint32, uint32> > spsummon_counter; std::unordered_map<uint32, std::pair<uint32, uint32> > spsummon_counter;
......
processor.cpp
View file @ 86121c09
...@@ -2853,7 +2853,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2853,7 +2853,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} else { } else {
core.units.begin()->step = 39; core.units.begin()->step = 39;
core.ctype = ctype; core.units.begin()->arg1 = ctype;
pduel->write_buffer8(MSG_HINT); pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_EVENT); pduel->write_buffer8(HINT_EVENT);
pduel->write_buffer8(1 - infos.turn_player); pduel->write_buffer8(1 - infos.turn_player);
...@@ -3632,7 +3632,6 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3632,7 +3632,6 @@ int32 field::process_battle_command(uint16 step) {
cait->triggering_effect->handler->set_status(STATUS_CHAINING, FALSE); cait->triggering_effect->handler->set_status(STATUS_CHAINING, FALSE);
add_process(PROCESSOR_SOLVE_CHAIN, 0, 0, 0, FALSE, 0); add_process(PROCESSOR_SOLVE_CHAIN, 0, 0, 0, FALSE, 0);
core.units.begin()->step = -1; core.units.begin()->step = -1;
core.ctype = 0;
return FALSE; return FALSE;
} }
reset_phase(PHASE_BATTLE_STEP); reset_phase(PHASE_BATTLE_STEP);
...@@ -3640,8 +3639,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3640,8 +3639,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 41: { case 41: {
core.units.begin()->arg1 = core.ctype; // normal end of battle step
core.ctype = 0;
if(is_player_affected_by_effect(infos.turn_player, EFFECT_BP_TWICE)) if(is_player_affected_by_effect(infos.turn_player, EFFECT_BP_TWICE))
core.units.begin()->arg2 = 1; core.units.begin()->arg2 = 1;
else else
......
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