Skip to content

Y
ygopro-core
Commit 70b98b61 authored by salix5's avatar salix5
Browse files
Options

Merge pull request #16 from DailyShana/patch-1 

fix swap control
parents b490235a 51783f29
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
operations.cpp
View file @ 70b98b61
...@@ -869,7 +869,6 @@ int32 field::swap_control(uint16 step, effect * reason_effect, uint8 reason_play ...@@ -869,7 +869,6 @@ int32 field::swap_control(uint16 step, effect * reason_effect, uint8 reason_play
pcard2->filter_disable_related_cards(); pcard2->filter_disable_related_cards();
pcard1->set_status(STATUS_ATTACK_CANCELED, TRUE); pcard1->set_status(STATUS_ATTACK_CANCELED, TRUE);
pcard2->set_status(STATUS_ATTACK_CANCELED, TRUE); pcard2->set_status(STATUS_ATTACK_CANCELED, TRUE);
adjust_instant();
return FALSE; return FALSE;
} }
case 1: { case 1: {
...@@ -884,6 +883,7 @@ int32 field::swap_control(uint16 step, effect * reason_effect, uint8 reason_play ...@@ -884,6 +883,7 @@ int32 field::swap_control(uint16 step, effect * reason_effect, uint8 reason_play
pduel->write_buffer8(pcard1->current.location); pduel->write_buffer8(pcard1->current.location);
pduel->write_buffer8(pcard1->current.sequence); pduel->write_buffer8(pcard1->current.sequence);
pduel->write_buffer8(pcard1->current.position); pduel->write_buffer8(pcard1->current.position);
adjust_instant();
raise_single_event(pcard1, 0, EVENT_CONTROL_CHANGED, reason_effect, REASON_EFFECT, reason_player, pcard1->current.controler, 0); raise_single_event(pcard1, 0, EVENT_CONTROL_CHANGED, reason_effect, REASON_EFFECT, reason_player, pcard1->current.controler, 0);
raise_single_event(pcard2, 0, EVENT_CONTROL_CHANGED, reason_effect, REASON_EFFECT, reason_player, pcard2->current.controler, 0); raise_single_event(pcard2, 0, EVENT_CONTROL_CHANGED, reason_effect, REASON_EFFECT, reason_player, pcard2->current.controler, 0);
process_single_event(); process_single_event();
......
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