update gframe

Classes/gframe/client_field.cpp

@@ -595,11 +595,11 @@ void ClientField::ShowLocationCard() {
 				mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f);
 		} else if(display_cards[i]->location == LOCATION_EXTRA || display_cards[i]->location == LOCATION_REMOVED) {
 			if(display_cards[i]->position & POS_FACEDOWN)
-				mainGame->stCardPos[i]->setOverrideColor(0xff0000ff);
+				mainGame->stDisplayPos[i]->setOverrideColor(0xff0000ff);
 			if(display_cards[i]->controler)
-				mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a);
+				mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a);
 			else 
-				mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
+				mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f);
 		} else {
 			if(display_cards[i]->controler)
 				mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a);

Classes/gframe/client_field.h

@@ -16,13 +16,13 @@ class ClientCard;
 
 struct ChainInfo {
 	irr::core::vector3df chain_pos;
-	ClientCard* chain_card;
-	int code;
-	int desc;
-	int controler;
-	int location;
-	int sequence;
-	bool solved;
+	ClientCard* chain_card{ nullptr };
+	int code{ 0 };
+	int desc{ 0 };
+	int controler{ 0 };
+	int location{ 0 };
+	int sequence{ 0 };
+	bool solved{ false };
 	bool need_distinguish;
 	std::set<ClientCard*> target;
 };

Classes/gframe/duelclient.cpp

@@ -617,7 +617,7 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, unsigned int len) {
 		mainGame->device->setEventReceiver(&mainGame->dField);
 		if(!mainGame->dInfo.isTag) {
 			if(selftype > 1) {
-				mainGame->dInfo.player_type = 7;
+				mainGame->dInfo.player_type = NETPLAYER_TYPE_OBSERVER;
 				mainGame->btnLeaveGame->setText(dataManager.GetSysString(1350));
 				mainGame->btnLeaveGame->setVisible(true);
 				mainGame->btnSpectatorSwap->setVisible(true);

Classes/gframe/network.h

@@ -12,16 +12,16 @@
 namespace ygo {
 
 struct HostInfo {
-	unsigned int lflist;
-	unsigned char rule;
-	unsigned char mode;
-	unsigned char duel_rule;
-	bool no_check_deck;
-	bool no_shuffle_deck;
-	unsigned int start_lp;
-	unsigned char start_hand;
-	unsigned char draw_count;
-	unsigned short time_limit;
+	unsigned int lflist{ 0 };
+	unsigned char rule{ 0 };
+	unsigned char mode{ 0 };
+	unsigned char duel_rule{ 0 };
+	bool no_check_deck{ false };
+	bool no_shuffle_deck{ false };
+	unsigned int start_lp{ 0 };
+	unsigned char start_hand{ 0 };
+	unsigned char draw_count{ 0 };
+	unsigned short time_limit{ 0 };
 };
 struct HostPacket {
 	unsigned short identifier;
@@ -99,22 +99,17 @@ struct STOC_HS_WatchChange {
 class DuelMode;
 
 struct DuelPlayer {
-	unsigned short name[20];
-	DuelMode* game;
-	unsigned char type;
-	unsigned char state;
-	bufferevent* bev;
-	DuelPlayer() {
-		game = 0;
-		type = 0;
-		state = 0;
-		bev = 0;
-	}
+	unsigned short name[20]{ 0 };
+	DuelMode* game{ nullptr };
+	unsigned char player_id{ 0xff };
+	unsigned char type{ 0 };
+	unsigned char state{ 0 };
+	bufferevent* bev{ 0 };
 };
 
 class DuelMode {
 public:
-	DuelMode(): host_player(0), pduel(0), duel_stage(0) {}
+	DuelMode(): host_player(nullptr), pduel(0), duel_stage(0) {}
 	virtual ~DuelMode() {}
 	virtual void Chat(DuelPlayer* dp, void* pdata, int len) {}
 	virtual void JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {}

Classes/gframe/single_duel.cpp

@@ -9,13 +9,6 @@ namespace ygo {
 
 SingleDuel::SingleDuel(bool is_match) {
 	match_mode = is_match;
-	match_kill = 0;
-	for(int i = 0; i < 2; ++i) {
-		players[i] = 0;
-		ready[i] = false;
-	}
-	duel_count = 0;
-	memset(match_result, 0, 3);
 }
 SingleDuel::~SingleDuel() {
 }
@@ -347,6 +340,8 @@ void SingleDuel::StartDuel(DuelPlayer* dp) {
 	hand_result[1] = 0;
 	players[0]->state = CTOS_HAND_RESULT;
 	players[1]->state = CTOS_HAND_RESULT;
+	players[0]->player_id = 0;
+	players[1]->player_id = 1;
 	duel_stage = DUEL_STAGE_FINGER;
 }
 void SingleDuel::HandResult(DuelPlayer* dp, unsigned char res) {
@@ -394,8 +389,6 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 		return;
 	duel_stage = DUEL_STAGE_DUELING;
 	bool swapped = false;
-	pplayer[0] = players[0];
-	pplayer[1] = players[1];
 	if((tp && dp->type == 1) || (!tp && dp->type == 0)) {
 		DuelPlayer* p = players[0];
 		players[0] = players[1];
@@ -535,15 +528,6 @@ void SingleDuel::DuelEndProc() {
 				NetServer::ReSendToPlayer(*oit);
 			duel_stage = DUEL_STAGE_END;
 		} else {
-			if(players[0] != pplayer[0]) {
-				players[0] = pplayer[0];
-				players[1] = pplayer[1];
-				players[0]->type = 0;
-				players[1]->type = 1;
-				Deck d = pdeck[0];
-				pdeck[0] = pdeck[1];
-				pdeck[1] = d;
-			}
 			ready[0] = false;
 			ready[1] = false;
 			players[0]->state = CTOS_UPDATE_DECK;
@@ -557,7 +541,7 @@ void SingleDuel::DuelEndProc() {
 	}
 }
 void SingleDuel::Surrender(DuelPlayer* dp) {
-	if(dp->type > 1 || !pduel)
+	if (dp->type > 1 || dp->player_id > 1 || !pduel)
 		return;
 	unsigned char wbuf[3];
 	uint32 player = dp->type;
@@ -568,13 +552,9 @@ void SingleDuel::Surrender(DuelPlayer* dp) {
 	NetServer::ReSendToPlayer(players[1]);
 	for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 		NetServer::ReSendToPlayer(*oit);
-	if(players[player] == pplayer[player]) {
-		match_result[duel_count++] = 1 - player;
-		tp_player = player;
-	} else {
-		match_result[duel_count++] = player;
-		tp_player = 1 - player;
-	}
+	match_result[duel_count] = 1 - dp->player_id;
+	++duel_count;
+	tp_player = player;
 	EndDuel();
 	DuelEndProc();
 	event_del(etimer);
@@ -633,15 +613,14 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
 			for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 				NetServer::ReSendToPlayer(*oit);
 			if(player > 1) {
-				match_result[duel_count++] = 2;
+				match_result[duel_count] = 2;
 				tp_player = 1 - tp_player;
-			} else if(players[player] == pplayer[player]) {
-				match_result[duel_count++] = player;
+			}
+			else {
+				match_result[duel_count] = players[player]->player_id;
 				tp_player = 1 - player;
-			} else {
-				match_result[duel_count++] = 1 - player;
-				tp_player = player;
 			}
+			++duel_count;
 			EndDuel();
 			return 2;
 		}
@@ -1598,13 +1577,9 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {
 		NetServer::ReSendToPlayer(sd->players[1]);
 		for(auto oit = sd->observers.begin(); oit != sd->observers.end(); ++oit)
 			NetServer::ReSendToPlayer(*oit);
-		if(sd->players[player] == sd->pplayer[player]) {
-			sd->match_result[sd->duel_count++] = 1 - player;
-			sd->tp_player = player;
-		} else {
-			sd->match_result[sd->duel_count++] = player;
-			sd->tp_player = 1 - player;
-		}
+		sd->match_result[sd->duel_count] = sd->players[1 - player]->player_id;
+		++sd->duel_count;
+		sd->tp_player = player;
 		sd->EndDuel();
 		sd->DuelEndProc();
 		event_del(sd->etimer);

Classes/gframe/single_duel.h

@@ -45,22 +45,21 @@ private:
 	int WriteUpdateData(int& player, int location, int& flag, unsigned char*& qbuf, int& use_cache);
 	
 protected:
-	DuelPlayer* players[2];
-	DuelPlayer* pplayer[2];
-	bool ready[2];
+	DuelPlayer* players[2]{ nullptr };
+	bool ready[2]{ false };
 	Deck pdeck[2];
-	int deck_error[2];
-	unsigned char hand_result[2];
-	unsigned char last_response;
+	int deck_error[2]{ 0 };
+	unsigned char hand_result[2]{ 0 };
+	unsigned char last_response{ 0 };
 	std::set<DuelPlayer*> observers;
 	Replay last_replay;
-	bool match_mode;
-	int match_kill;
-	unsigned char duel_count;
-	unsigned char tp_player;
-	unsigned char match_result[3];
-	short time_limit[2];
-	short time_elapsed;
+	bool match_mode{ false };
+	int match_kill{ 0 };
+	unsigned char duel_count{ 0 };
+	unsigned char tp_player{ 0 };
+	unsigned char match_result[3]{ 0 };
+	short time_limit[2]{ 0 };
+	short time_elapsed{ 0 };
 };
 
 }