From 90f66d99bff8815de9aa85d0888ed009d0163708 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 26 Aug 2010 23:14:55 +0000
Subject: [PATCH] - updated game data checks display on server

---
 .../glest_game/menu/menu_state_custom_game.cpp  | 17 ++++-------------
 source/glest_game/network/network_message.cpp   |  6 ++++++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 8a1de47a..ed05c6db 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -1041,30 +1041,24 @@ void MenuStateCustomGame::update() {
 								string lastTechtreeDataSynchError;
 
 								if(connectionSlot->getReceivedDataSynchCheck() == true &&
-									lastMapDataSynchError != "map CRC mismatch") {
-									lastMapDataSynchError = "map CRC mismatch";
+									lastMapDataSynchError != "map CRC mismatch, " + listBoxMap.getSelectedItem()) {
+									lastMapDataSynchError = "map CRC mismatch, " + listBoxMap.getSelectedItem();
 									ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
 									serverInterface->sendTextMessage(lastMapDataSynchError,-1, true);
 								}
 							}
-							else {
-								lastMapDataSynchError = "";
-							}
 
 							connectionSlot= serverInterface->getSlot(i);
 							if(connectionSlot != NULL && connectionSlot->getNetworkGameDataSynchCheckOkTile() == false) {
 								label = label + " tile";
 
 								if(connectionSlot->getReceivedDataSynchCheck() == true &&
-									lastTileDataSynchError != "tileset CRC mismatch") {
-									lastTileDataSynchError = "tileset CRC mismatch";
+									lastTileDataSynchError != "tile CRC mismatch, " + listBoxTileset.getSelectedItem()) {
+									lastTileDataSynchError = "tile CRC mismatch, " + listBoxTileset.getSelectedItem();
 									ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
 									serverInterface->sendTextMessage(lastTileDataSynchError,-1,true);
 								}
 							}
-							else {
-								lastTileDataSynchError = "";
-							}
 
 							connectionSlot= serverInterface->getSlot(i);
 							if(connectionSlot != NULL && connectionSlot->getNetworkGameDataSynchCheckOkTech() == false)
@@ -1089,9 +1083,6 @@ void MenuStateCustomGame::update() {
 									}
 								}
 							}
-							else {
-								lastTechtreeDataSynchError = "";
-							}
 
 							connectionSlot= serverInterface->getSlot(i);
 							if(connectionSlot != NULL) {
diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp
index 4c080930..9b7542d4 100644
--- a/source/glest_game/network/network_message.cpp
+++ b/source/glest_game/network/network_message.cpp
@@ -508,6 +508,9 @@ string NetworkMessageSynchNetworkGameData::getTechCRCFileMismatchReport(vector<s
 	if(vctFileList.size() <= 0) {
 		result = result + "Local player has no files.\n";
 	}
+	else if(data.header.techCRCFileCount <= 0) {
+		result = result + "Remote player has no files.\n";
+	}
 	else {
 		for(int idx = 0; idx < vctFileList.size(); ++idx) {
 			std::pair<string,int32> &fileInfo = vctFileList[idx];
@@ -698,6 +701,9 @@ string NetworkMessageSynchNetworkGameDataStatus::getTechCRCFileMismatchReport(st
 	if(vctFileList.size() <= 0) {
 		result = result + "Local player has no files.\n";
 	}
+	else if(data.header.techCRCFileCount <= 0) {
+		result = result + "Remote player has no files.\n";
+	}
 	else {
 		for(int idx = 0; idx < vctFileList.size(); ++idx) {
 			std::pair<string,int32> &fileInfo = vctFileList[idx];