Skip to content

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

fix attack roll back for EFFECT_MUST_ATTACK

parent aaad6820
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
processor.cpp
View file @ 166d4582
...@@ -2620,6 +2620,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2620,6 +2620,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 8: { case 8: {
core.attack_cancelable = TRUE;
pduel->write_buffer8(MSG_ATTACK); pduel->write_buffer8(MSG_ATTACK);
pduel->write_buffer32(core.attacker->get_info_location()); pduel->write_buffer32(core.attacker->get_info_location());
if(core.attack_target) { if(core.attack_target) {
...@@ -2703,6 +2704,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2703,6 +2704,7 @@ int32 field::process_battle_command(uint16 step) {
add_process(PROCESSOR_SELECT_YESNO, 0, 0, 0, infos.turn_player, 30); add_process(PROCESSOR_SELECT_YESNO, 0, 0, 0, infos.turn_player, 30);
else { else {
returns.ivalue[0] = TRUE; returns.ivalue[0] = TRUE;
core.attack_cancelable = FALSE;
} }
return FALSE; return FALSE;
} }
...@@ -2711,7 +2713,6 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2711,7 +2713,6 @@ int32 field::process_battle_command(uint16 step) {
if(returns.ivalue[0]) { if(returns.ivalue[0]) {
core.units.begin()->arg1 = TRUE; core.units.begin()->arg1 = TRUE;
core.units.begin()->arg3 = FALSE; core.units.begin()->arg3 = FALSE;
core.attack_cancelable = TRUE;
core.units.begin()->step = 3; core.units.begin()->step = 3;
} }
return FALSE; return FALSE;
......
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