Skip to content

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

update

parent 7f6e1a3b
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 21 deletions
field.cpp
View file @ f59b847a
...@@ -541,18 +541,14 @@ void field::shuffle(uint8 playerid, uint8 location) { ...@@ -541,18 +541,14 @@ void field::shuffle(uint8 playerid, uint8 location) {
pduel->write_buffer8(MSG_SHUFFLE_DECK); pduel->write_buffer8(MSG_SHUFFLE_DECK);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
core.shuffle_deck_check[playerid] = FALSE; core.shuffle_deck_check[playerid] = FALSE;
if(core.global_flag & GLOBALFLAG_DECK_REVERSE_CHECK) { card* ptop = svector.back();
card* ptop = svector.back(); if((core.global_flag & GLOBALFLAG_DECK_REVERSE_CHECK) && (core.deck_reversed || (ptop->current.position == POS_FACEUP_DEFENCE))) {
if(core.deck_reversed || (ptop->current.position == POS_FACEUP_DEFENCE)) { if(ptop->current.position != POS_FACEUP_DEFENCE)
pduel->write_buffer8(MSG_DECK_TOP); pduel->write_buffer32(ptop->data.code);
pduel->write_buffer8(playerid); else
pduel->write_buffer8(0); pduel->write_buffer32(ptop->data.code | 0x80000000);
if(ptop->current.position != POS_FACEUP_DEFENCE) } else
pduel->write_buffer32(ptop->data.code); pduel->write_buffer32(0);
else
pduel->write_buffer32(ptop->data.code | 0x80000000);
}
}
} }
} }
void field::reset_sequence(uint8 playerid, uint8 location) { void field::reset_sequence(uint8 playerid, uint8 location) {
......
processor.cpp
View file @ f59b847a
...@@ -5243,25 +5243,24 @@ int32 field::adjust_step(uint16 step) { ...@@ -5243,25 +5243,24 @@ int32 field::adjust_step(uint16 step) {
if(res) { if(res) {
if(player[0].list_main.size()) { if(player[0].list_main.size()) {
card* ptop = player[0].list_main.back(); card* ptop = player[0].list_main.back();
pduel->write_buffer8(MSG_DECK_TOP);
pduel->write_buffer8(0);
pduel->write_buffer8(0);
if(ptop->current.position != POS_FACEUP_DEFENCE) if(ptop->current.position != POS_FACEUP_DEFENCE)
pduel->write_buffer32(ptop->data.code); pduel->write_buffer32(ptop->data.code);
else else
pduel->write_buffer32(ptop->data.code | 0x80000000); pduel->write_buffer32(ptop->data.code | 0x80000000);
} } else
pduel->write_buffer32(0);
if(player[1].list_main.size()) { if(player[1].list_main.size()) {
card* ptop = player[1].list_main.back(); card* ptop = player[1].list_main.back();
pduel->write_buffer8(MSG_DECK_TOP);
pduel->write_buffer8(1);
pduel->write_buffer8(0);
if(ptop->current.position != POS_FACEUP_DEFENCE) if(ptop->current.position != POS_FACEUP_DEFENCE)
pduel->write_buffer32(ptop->data.code); pduel->write_buffer32(ptop->data.code);
else else
pduel->write_buffer32(ptop->data.code | 0x80000000); pduel->write_buffer32(ptop->data.code | 0x80000000);
} } else
} pduel->write_buffer32(0);
} else {
pduel->write_buffer32(0);
pduel->write_buffer32(0);
}
} }
core.deck_reversed = res; core.deck_reversed = res;
} }
......
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