mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-30 17:39:02 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix to have consistent info sent to masterserver when in game or in lobby

Browse Source
This commit is contained in:
Mark Vejvoda
2012-07-11 05:12:10 +00:00
parent 703afaa5de
commit be61ed89da
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2698,9 +2698,14 @@ void MenuStateCustomGame::publishToMasterserver() {
//ip is automatically set //ip is automatically set
//game setup info: //game setup info:
publishToServerInfo["tech"] = listBoxTechTree.getSelectedItem();
publishToServerInfo["map"] = listBoxMap.getSelectedItem(); //publishToServerInfo["tech"] = listBoxTechTree.getSelectedItem();
publishToServerInfo["tileset"] = listBoxTileset.getSelectedItem(); publishToServerInfo["tech"] = techTreeFiles[listBoxTechTree.getSelectedItemIndex()];
//publishToServerInfo["map"] = listBoxMap.getSelectedItem();
publishToServerInfo["map"] = getCurrentMapFile();
//publishToServerInfo["tileset"] = listBoxTileset.getSelectedItem();
publishToServerInfo["tileset"] = tilesetFiles[listBoxTileset.getSelectedItemIndex()];
publishToServerInfo["activeSlots"] = intToStr(slotCountUsed); publishToServerInfo["activeSlots"] = intToStr(slotCountUsed);
publishToServerInfo["networkSlots"] = intToStr(slotCountHumans); publishToServerInfo["networkSlots"] = intToStr(slotCountHumans);
publishToServerInfo["connectedClients"] = intToStr(slotCountConnectedPlayers); publishToServerInfo["connectedClients"] = intToStr(slotCountConnectedPlayers);

2
source/glest_game/network/server_interface.cpp
View File

@@ -2339,7 +2339,7 @@ std::map<string,string> ServerInterface::publishToMasterserver() {
} }
} }
publishToServerInfo["glestVersion"] = glestVersionString; publishToServerInfo["glestVersion"] = glestVersionString;
publishToServerInfo["platform"] = getPlatformNameString(); publishToServerInfo["platform"] = getPlatformNameString() + "-" + getSVNRevisionString();
publishToServerInfo["binaryCompileDate"] = getCompileDateTime(); publishToServerInfo["binaryCompileDate"] = getCompileDateTime();
publishToServerInfo["serverTitle"] = getHumanPlayerName() + "'s game"; publishToServerInfo["serverTitle"] = getHumanPlayerName() + "'s game";
publishToServerInfo["tech"] = this->getGameSettings()->getTech(); publishToServerInfo["tech"] = this->getGameSettings()->getTech();