Skip to content

Y
ygopro-core
Commit 6dc01bba authored by Argon.Sun's avatar Argon.Sun
Browse files
Options

update

parent 333db813
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 17 deletions
operations.cpp
View file @ 6dc01bba
...@@ -879,15 +879,9 @@ int32 field::swap_control(uint16 step, effect * reason_effect, uint8 reason_play ...@@ -879,15 +879,9 @@ int32 field::swap_control(uint16 step, effect * reason_effect, uint8 reason_play
case 1: { case 1: {
pduel->write_buffer8(MSG_SWAP); pduel->write_buffer8(MSG_SWAP);
pduel->write_buffer32(pcard1->data.code); pduel->write_buffer32(pcard1->data.code);
pduel->write_buffer8(pcard2->current.controler); pduel->write_buffer32(pcard2->get_info_location());
pduel->write_buffer8(pcard2->current.location);
pduel->write_buffer8(pcard2->current.sequence);
pduel->write_buffer8(pcard2->current.position);
pduel->write_buffer32(pcard2->data.code); pduel->write_buffer32(pcard2->data.code);
pduel->write_buffer8(pcard1->current.controler); pduel->write_buffer32(pcard1->get_info_location());
pduel->write_buffer8(pcard1->current.location);
pduel->write_buffer8(pcard1->current.sequence);
pduel->write_buffer8(pcard1->current.position);
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();
...@@ -995,15 +989,9 @@ int32 field::control_adjust(uint16 step) { ...@@ -995,15 +989,9 @@ int32 field::control_adjust(uint16 step) {
pcard2->reset(RESET_CONTROL, RESET_EVENT); pcard2->reset(RESET_CONTROL, RESET_EVENT);
pduel->write_buffer8(MSG_SWAP); pduel->write_buffer8(MSG_SWAP);
pduel->write_buffer32(pcard1->data.code); pduel->write_buffer32(pcard1->data.code);
pduel->write_buffer8(pcard2->current.controler); pduel->write_buffer32(pcard2->get_info_location());
pduel->write_buffer8(pcard2->current.location);
pduel->write_buffer8(pcard2->current.sequence);
pduel->write_buffer8(pcard2->current.position);
pduel->write_buffer32(pcard2->data.code); pduel->write_buffer32(pcard2->data.code);
pduel->write_buffer8(pcard1->current.controler); pduel->write_buffer32(pcard1->get_info_location());
pduel->write_buffer8(pcard1->current.location);
pduel->write_buffer8(pcard1->current.sequence);
pduel->write_buffer8(pcard1->current.position);
} }
card_set* adjust_set = new card_set; card_set* adjust_set = new card_set;
core.units.begin()->ptarget = (group*)adjust_set; core.units.begin()->ptarget = (group*)adjust_set;
......
processor.cpp
View file @ 6dc01bba
...@@ -4515,7 +4515,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2 ...@@ -4515,7 +4515,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
core.spsummon_rst = false; core.spsummon_rst = false;
} }
pduel->write_buffer8(MSG_CHAIN_SOLVING); pduel->write_buffer8(MSG_CHAIN_SOLVING);
pduel->write_buffer8(cait->chain_count);
add_to_disable_check_list(cait->triggering_effect->handler); add_to_disable_check_list(cait->triggering_effect->handler);
adjust_instant(); adjust_instant();
raise_event((card*)0, EVENT_CHAIN_ACTIVATING, cait->triggering_effect, 0, cait->triggering_player, cait->triggering_player, cait->chain_count); raise_event((card*)0, EVENT_CHAIN_ACTIVATING, cait->triggering_effect, 0, cait->triggering_player, cait->triggering_player, cait->chain_count);
......
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