Skip to content

Y
ygopro-core
Commit 90942484 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

parents e64f8246 a8ffd6db
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
processor.cpp
View file @ 90942484
...@@ -3053,8 +3053,10 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3053,8 +3053,10 @@ int32 field::process_battle_command(uint16 step) {
raise_event((card*)0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0); raise_event((card*)0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0);
process_single_event(); process_single_event();
process_instant_event(); process_instant_event();
if(core.effect_damage_step) if(core.effect_damage_step) {
core.reserved.ptr1 = core.units.begin()->ptarget;
return TRUE; return TRUE;
}
core.units.begin()->step = 32; core.units.begin()->step = 32;
} }
// fall through // fall through
...@@ -3239,7 +3241,7 @@ int32 field::process_damage_step(uint16 step, uint32 new_attack) { ...@@ -3239,7 +3241,7 @@ int32 field::process_damage_step(uint16 step, uint32 new_attack) {
} }
case 2: { case 2: {
core.effect_damage_step = 2; core.effect_damage_step = 2;
add_process(PROCESSOR_BATTLE_COMMAND, 32, 0, 0, 0, 0); add_process(PROCESSOR_BATTLE_COMMAND, 32, 0, (group*)core.units.begin()->ptr1, 0, 0);
return FALSE; return FALSE;
} }
case 3: { case 3: {
......
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