Skip to content

Y
ygopro-core
You need to sign in or sign up before continuing.
Commit 86d502db authored by mercury233's avatar mercury233
Browse files
Options

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

parents 949c4def 386e662f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
common.h
View file @ 86d502db
...@@ -247,7 +247,7 @@ struct card_sort { ...@@ -247,7 +247,7 @@ struct card_sort {
#define MSG_SELECT_PLACE 18 #define MSG_SELECT_PLACE 18
#define MSG_SELECT_POSITION 19 #define MSG_SELECT_POSITION 19
#define MSG_SELECT_TRIBUTE 20 #define MSG_SELECT_TRIBUTE 20
#define MSG_SORT_CHAIN 21 //#define MSG_SORT_CHAIN 21
#define MSG_SELECT_COUNTER 22 #define MSG_SELECT_COUNTER 22
#define MSG_SELECT_SUM 23 #define MSG_SELECT_SUM 23
#define MSG_SELECT_DISFIELD 24 #define MSG_SELECT_DISFIELD 24
......
field.h
View file @ 86d502db
...@@ -610,7 +610,7 @@ public: ...@@ -610,7 +610,7 @@ public:
int32 select_tribute(uint16 step, uint8 playerid, uint8 cancelable, uint8 min, uint8 max); int32 select_tribute(uint16 step, uint8 playerid, uint8 cancelable, uint8 min, uint8 max);
int32 select_counter(uint16 step, uint8 playerid, uint16 countertype, uint16 count, uint8 s, uint8 o); int32 select_counter(uint16 step, uint8 playerid, uint16 countertype, uint16 count, uint8 s, uint8 o);
int32 select_with_sum_limit(int16 step, uint8 playerid, int32 acc, int32 min, int32 max); int32 select_with_sum_limit(int16 step, uint8 playerid, int32 acc, int32 min, int32 max);
int32 sort_card(int16 step, uint8 playerid, uint8 is_chain); int32 sort_card(int16 step, uint8 playerid);
int32 announce_race(int16 step, uint8 playerid, int32 count, int32 available); int32 announce_race(int16 step, uint8 playerid, int32 count, int32 available);
int32 announce_attribute(int16 step, uint8 playerid, int32 count, int32 available); int32 announce_attribute(int16 step, uint8 playerid, int32 count, int32 available);
int32 announce_card(int16 step, uint8 playerid); int32 announce_card(int16 step, uint8 playerid);
......
playerop.cpp
View file @ 86d502db
...@@ -708,7 +708,7 @@ int32 field::select_with_sum_limit(int16 step, uint8 playerid, int32 acc, int32 ...@@ -708,7 +708,7 @@ int32 field::select_with_sum_limit(int16 step, uint8 playerid, int32 acc, int32
} }
return TRUE; return TRUE;
} }
int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) { int32 field::sort_card(int16 step, uint8 playerid) {
if(step == 0) { if(step == 0) {
returns.bvalue[0] = 0; returns.bvalue[0] = 0;
if((playerid == 1) && (core.duel_options & DUEL_SIMPLE_AI)) { if((playerid == 1) && (core.duel_options & DUEL_SIMPLE_AI)) {
...@@ -717,9 +717,6 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) { ...@@ -717,9 +717,6 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) {
} }
if(core.select_cards.empty()) if(core.select_cards.empty())
return TRUE; return TRUE;
if(is_chain)
pduel->write_buffer8(MSG_SORT_CHAIN);
else
pduel->write_buffer8(MSG_SORT_CARD); pduel->write_buffer8(MSG_SORT_CARD);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer8(core.select_cards.size()); pduel->write_buffer8(core.select_cards.size());
......
processor.cpp
View file @ 86d502db
...@@ -180,7 +180,7 @@ int32 field::process() { ...@@ -180,7 +180,7 @@ int32 field::process() {
} }
} }
case PROCESSOR_SORT_CARD: { case PROCESSOR_SORT_CARD: {
if (sort_card(it->step, it->arg1, it->arg2)) { if (sort_card(it->step, it->arg1)) {
core.units.pop_front(); core.units.pop_front();
return pduel->bufferlen; return pduel->bufferlen;
} else { } else {
......
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