Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- updated game data checks display on server

This commit is contained in:
Mark Vejvoda 2010-08-26 23:14:55 +00:00
parent f765ab0880
commit 90f66d99bf
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -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) {

6
source/glest_game/network/network_message.cpp
View File

@ -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];