diff --git a/mk/shared/servers.ini b/mk/shared/servers.ini deleted file mode 100644 index fabf9c86f..000000000 --- a/mk/shared/servers.ini +++ /dev/null @@ -1,6 +0,0 @@ -; === propertyMap File === - -Initiate_1=94.23.148.250:62001 -Initiate_2=94.23.148.250:62012 -Initiate_3=94.23.148.250:62023 -This computer=127.0.0.1 diff --git a/mk/windows/vs2015-32/zetaglest.vcxproj b/mk/windows/vs2015-32/zetaglest.vcxproj index 1a09e891b..d444c15d8 100644 --- a/mk/windows/vs2015-32/zetaglest.vcxproj +++ b/mk/windows/vs2015-32/zetaglest.vcxproj @@ -767,9 +767,6 @@ PreserveNewest - - PreserveNewest - diff --git a/mk/windows/vs2015-64/zetaglest.vcxproj b/mk/windows/vs2015-64/zetaglest.vcxproj index 02a70ab02..615e2726b 100644 --- a/mk/windows/vs2015-64/zetaglest.vcxproj +++ b/mk/windows/vs2015-64/zetaglest.vcxproj @@ -579,9 +579,6 @@ PreserveNewest - - PreserveNewest - diff --git a/mk/windows/vs2017-32/zetaglest.vcxproj b/mk/windows/vs2017-32/zetaglest.vcxproj index d324e0b67..910cb80e9 100644 --- a/mk/windows/vs2017-32/zetaglest.vcxproj +++ b/mk/windows/vs2017-32/zetaglest.vcxproj @@ -767,9 +767,6 @@ PreserveNewest - - PreserveNewest - diff --git a/mk/windows/vs2017-64/zetaglest.vcxproj b/mk/windows/vs2017-64/zetaglest.vcxproj index 961c3c663..8c978257b 100644 --- a/mk/windows/vs2017-64/zetaglest.vcxproj +++ b/mk/windows/vs2017-64/zetaglest.vcxproj @@ -579,9 +579,6 @@ PreserveNewest - - PreserveNewest - diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp index e8d673960..18193ca89 100644 --- a/source/glest_game/game/commander.cpp +++ b/source/glest_game/game/commander.cpp @@ -467,7 +467,6 @@ namespace ignoreBuildings = true; command[i] = commandType; } - Game* game = world->getGame(); for (int i = 0; i < selection->getCount(); ++i) { const Unit * unit = selection->getUnit(i); const CommandType *commandType = command[i]; diff --git a/source/glest_game/menu/menu_state_join_game.cpp b/source/glest_game/menu/menu_state_join_game.cpp index 5a83cc4e1..f21fa800d 100644 --- a/source/glest_game/menu/menu_state_join_game.cpp +++ b/source/glest_game/menu/menu_state_join_game.cpp @@ -49,8 +49,6 @@ namespace Glest { const int MenuStateJoinGame::newPrevServerIndex = 1; const int MenuStateJoinGame::foundServersIndex = 2; - const string MenuStateJoinGame::serverFileName = "servers.ini"; - MenuStateJoinGame::MenuStateJoinGame(Program * program, MainMenu * mainMenu, bool * @@ -97,8 +95,6 @@ namespace Glest { networkManager.end(); networkManager.init(nrClient); - serversSavedFile = serverFileName; - string serverListPath = config.getString("ServerListPath", ""); if (serverListPath != "") { endPathWithSlash(serverListPath); @@ -108,18 +104,6 @@ namespace Glest { if (userData != "") { endPathWithSlash(userData); } - serversSavedFile = userData + serversSavedFile; - - if (fileExists(serversSavedFile) == true) { - servers.load(serversSavedFile); - } else if (fileExists(serverListPath + serverFileName) == true) { - servers.load(serverListPath + serverFileName); - } else if (fileExists(Properties::getApplicationPath() + serverFileName) - == true) { - servers.load(Properties::getApplicationPath() + serverFileName); - } else if (fileExists(serverFileName) == true) { - servers.load(serverFileName); - } //buttons buttonReturn.registerGraphicComponent(containerName, "buttonReturn"); @@ -722,8 +706,6 @@ namespace Glest { "In [%s::%s] clientInterface->getLaunchGame() - A\n", __FILE__, __FUNCTION__); - servers.save(serversSavedFile); - if (SystemFlags:: getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, @@ -961,7 +943,6 @@ namespace Glest { saveHost += ":" + hostPartsList[1]; } servers.setString(clientInterface->getServerName(), saveHost); - servers.save(serversSavedFile); if (SystemFlags:: getSystemSettingType(SystemFlags::debugSystem).enabled) diff --git a/source/glest_game/menu/menu_state_join_game.h b/source/glest_game/menu/menu_state_join_game.h index 6dd3c8b48..74101da88 100644 --- a/source/glest_game/menu/menu_state_join_game.h +++ b/source/glest_game/menu/menu_state_join_game.h @@ -44,9 +44,6 @@ namespace Glest { newPrevServerIndex; static const int foundServersIndex; - static const - string - serverFileName; private: GraphicButton buttonReturn; @@ -74,7 +71,6 @@ namespace Glest { //Console console; ChatManager chatManager; - string serversSavedFile; bool abortAutoFind; bool autoConnectToServer;