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

common.h

@@ -247,7 +247,7 @@ struct card_sort {
 #define MSG_SELECT_PLACE		18
 #define MSG_SELECT_POSITION		19
 #define MSG_SELECT_TRIBUTE		20
-#define MSG_SORT_CHAIN			21
+//#define MSG_SORT_CHAIN			21
 #define MSG_SELECT_COUNTER		22
 #define MSG_SELECT_SUM			23
 #define MSG_SELECT_DISFIELD		24

field.h

@@ -610,7 +610,7 @@ public:
 	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_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_attribute(int16 step, uint8 playerid, int32 count, int32 available);
 	int32 announce_card(int16 step, uint8 playerid);

playerop.cpp

@@ -708,7 +708,7 @@ int32 field::select_with_sum_limit(int16 step, uint8 playerid, int32 acc, int32
 	}
 	return TRUE;
 }
-int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) {
+int32 field::sort_card(int16 step, uint8 playerid) {
 	if(step == 0) {
 		returns.bvalue[0] = 0;
 		if((playerid == 1) && (core.duel_options & DUEL_SIMPLE_AI)) {
@@ -717,10 +717,7 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) {
 		}
 		if(core.select_cards.empty())
 			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(core.select_cards.size());
 		for(auto& pcard : core.select_cards) {

processor.cpp

@@ -180,7 +180,7 @@ int32 field::process() {
 		}
 	}
 	case PROCESSOR_SORT_CARD: {
-		if (sort_card(it->step, it->arg1, it->arg2)) {
+		if (sort_card(it->step, it->arg1)) {
 			core.units.pop_front();
 			return pduel->bufferlen;
 		} else {