From f1ef5e2ecd4cd55553eede5d2d578d2e5b0076dd Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 22 Sep 2012 21:44:30 +0000 Subject: [PATCH] - removed pathfinder as a configurable item in the UI --- .../menu/menu_state_connected_game.cpp | 42 ++++++------- .../menu/menu_state_connected_game.h | 4 +- .../menu/menu_state_custom_game.cpp | 62 +++++++++---------- .../glest_game/menu/menu_state_custom_game.h | 4 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 6e9bcf7f..ce3e46eb 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -226,16 +226,16 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM listBoxAISwitchTeamAcceptPercent.setSelectedItem(intToStr(30)); listBoxAISwitchTeamAcceptPercent.setEditable(false); - labelPathFinderType.registerGraphicComponent(containerName,"labelPathFinderType"); - labelPathFinderType.init(xoffset+650, aHeadPos, 80); - labelPathFinderType.setText(lang.get("PathFinderType")); + //labelPathFinderType.registerGraphicComponent(containerName,"labelPathFinderType"); + //labelPathFinderType.init(xoffset+650, aHeadPos, 80); + //labelPathFinderType.setText(lang.get("PathFinderType")); - listBoxPathFinderType.registerGraphicComponent(containerName,"listBoxPathFinderType"); - listBoxPathFinderType.init(xoffset+650, aPos, 150); - listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRegular")); + //listBoxPathFinderType.registerGraphicComponent(containerName,"listBoxPathFinderType"); + //listBoxPathFinderType.init(xoffset+650, aPos, 150); + //listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRegular")); - listBoxPathFinderType.setSelectedItemIndex(0); - listBoxPathFinderType.setEditable(false); + //listBoxPathFinderType.setSelectedItemIndex(0); + //listBoxPathFinderType.setEditable(false); listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); listBoxPlayerStatus.init(xoffset+650, 180, 150); @@ -591,11 +591,11 @@ void MenuStateConnectedGame::reloadUI() { } listBoxFallbackCpuMultiplier.setItems(rMultiplier); - labelPathFinderType.setText(lang.get("PathFinderType")); + //labelPathFinderType.setText(lang.get("PathFinderType")); - vector pathfinderItems; - pathfinderItems.push_back(lang.get("PathFinderTypeRegular")); - listBoxPathFinderType.setItems(pathfinderItems); + //vector pathfinderItems; + //pathfinderItems.push_back(lang.get("PathFinderTypeRegular")); + //listBoxPathFinderType.setItems(pathfinderItems); labelMap.setText(lang.get("Map")); @@ -1475,7 +1475,7 @@ void MenuStateConnectedGame::loadGameSettings(GameSettings *gameSettings) { //gameSettings->setEnableObserverModeAtEndGame(listBoxEnableObserverMode.getSelectedItemIndex() == 0); gameSettings->setEnableObserverModeAtEndGame(true); - gameSettings->setPathFinderType(static_cast(listBoxPathFinderType.getSelectedItemIndex())); + //gameSettings->setPathFinderType(static_cast(listBoxPathFinderType.getSelectedItemIndex())); valueFlags1 = gameSettings->getFlagTypes1(); if(listBoxEnableSwitchTeamMode.getSelectedItemIndex() == 0) { @@ -1878,13 +1878,13 @@ void MenuStateConnectedGame::render() { renderer.renderListBox(&listBoxTechTree); //renderer.renderLabel(&labelEnableObserverMode); - renderer.renderLabel(&labelPathFinderType); + //renderer.renderLabel(&labelPathFinderType); renderer.renderLabel(&labelEnableSwitchTeamMode); renderer.renderLabel(&labelAISwitchTeamAcceptPercent); //renderer.renderListBox(&listBoxEnableObserverMode); - renderer.renderListBox(&listBoxPathFinderType); + //renderer.renderListBox(&listBoxPathFinderType); renderer.renderListBox(&listBoxEnableSwitchTeamMode); renderer.renderListBox(&listBoxAISwitchTeamAcceptPercent); @@ -3642,12 +3642,12 @@ void MenuStateConnectedGame::setupUIFromGameSettings(GameSettings *gameSettings, // else { // listBoxEnableObserverMode.setSelectedItemIndex(1); // } - if(gameSettings->getPathFinderType() == pfBasic) { - listBoxPathFinderType.setSelectedItemIndex(0); - } - else { - listBoxPathFinderType.setSelectedItemIndex(1); - } +// if(gameSettings->getPathFinderType() == pfBasic) { +// listBoxPathFinderType.setSelectedItemIndex(0); +// } +// else { +// listBoxPathFinderType.setSelectedItemIndex(1); +// } // Control for(int i=0; igetMutexThreadObjectAccessor() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)); - - if(listBoxPublishServer.getSelectedItemIndex() == 0) { - needToRepublishToMasterserver = true; - } - - if(hasNetworkGameSettings() == true) - { - needToSetChangedGameSettings = true; - lastSetChangedGameSettings = time(NULL); - } - } +// else if (listBoxAdvanced.getSelectedItemIndex() == 1 && listBoxPathFinderType.mouseClick(x, y)) { +// MutexSafeWrapper safeMutex((publishToMasterserverThread != NULL ? publishToMasterserverThread->getMutexThreadObjectAccessor() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)); +// +// if(listBoxPublishServer.getSelectedItemIndex() == 0) { +// needToRepublishToMasterserver = true; +// } +// +// if(hasNetworkGameSettings() == true) +// { +// needToSetChangedGameSettings = true; +// lastSetChangedGameSettings = time(NULL); +// } +// } else if (listBoxAdvanced.mouseClick(x, y)) { //TODO } @@ -1798,8 +1798,8 @@ void MenuStateCustomGame::mouseMove(int x, int y, const MouseState *ms) { labelNetworkPauseGameForLaggedClients.mouseMove(x, y); listBoxNetworkPauseGameForLaggedClients.mouseMove(x, y); - labelPathFinderType.mouseMove(x, y); - listBoxPathFinderType.mouseMove(x, y); + //labelPathFinderType.mouseMove(x, y); + //listBoxPathFinderType.mouseMove(x, y); } listBoxTileset.mouseMove(x, y); listBoxMapFilter.mouseMove(x, y); @@ -1964,7 +1964,7 @@ void MenuStateCustomGame::render() { renderer.renderLabel(&labelFogOfWar); renderer.renderLabel(&labelAllowObservers); renderer.renderLabel(&labelFallbackCpuMultiplier); - renderer.renderLabel(&labelPathFinderType); + //renderer.renderLabel(&labelPathFinderType); renderer.renderLabel(&labelEnableSwitchTeamMode); renderer.renderLabel(&labelAISwitchTeamAcceptPercent); @@ -1972,7 +1972,7 @@ void MenuStateCustomGame::render() { renderer.renderListBox(&listBoxFogOfWar); renderer.renderListBox(&listBoxAllowObservers); //renderer.renderListBox(&listBoxEnableObserverMode); - renderer.renderListBox(&listBoxPathFinderType); + //renderer.renderListBox(&listBoxPathFinderType); renderer.renderListBox(&listBoxEnableSwitchTeamMode); renderer.renderListBox(&listBoxAISwitchTeamAcceptPercent); @@ -3108,7 +3108,7 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings,bool force //gameSettings->setEnableObserverModeAtEndGame(listBoxEnableObserverMode.getSelectedItemIndex() == 0); gameSettings->setEnableObserverModeAtEndGame(true); - gameSettings->setPathFinderType(static_cast(listBoxPathFinderType.getSelectedItemIndex())); + //gameSettings->setPathFinderType(static_cast(listBoxPathFinderType.getSelectedItemIndex())); valueFlags1 = gameSettings->getFlagTypes1(); if(listBoxEnableSwitchTeamMode.getSelectedItemIndex() == 0) { @@ -3579,7 +3579,7 @@ void MenuStateCustomGame::setupUIFromGameSettings(const GameSettings &gameSettin listBoxAISwitchTeamAcceptPercent.setSelectedItem(intToStr(gameSettings.getAiAcceptSwitchTeamPercentChance())); listBoxFallbackCpuMultiplier.setSelectedItemIndex(gameSettings.getFallbackCpuMultiplier()); - listBoxPathFinderType.setSelectedItemIndex(gameSettings.getPathFinderType()); + //listBoxPathFinderType.setSelectedItemIndex(gameSettings.getPathFinderType()); //listBoxEnableServerControlledAI.setSelectedItem(gameSettings.getEnableServerControlledAI() == true ? lang.get("Yes") : lang.get("No")); @@ -4325,7 +4325,7 @@ void MenuStateCustomGame::SetupUIForScenarios() { } listBoxFogOfWar.setEditable(false); listBoxAllowObservers.setEditable(false); - listBoxPathFinderType.setEditable(false); + //listBoxPathFinderType.setEditable(false); listBoxEnableSwitchTeamMode.setEditable(false); listBoxAISwitchTeamAcceptPercent.setEditable(false); listBoxFallbackCpuMultiplier.setEditable(false); @@ -4345,7 +4345,7 @@ void MenuStateCustomGame::SetupUIForScenarios() { } listBoxFogOfWar.setEditable(true); listBoxAllowObservers.setEditable(true); - listBoxPathFinderType.setEditable(true); + //listBoxPathFinderType.setEditable(true); listBoxEnableSwitchTeamMode.setEditable(true); listBoxAISwitchTeamAcceptPercent.setEditable(true); listBoxFallbackCpuMultiplier.setEditable(true); diff --git a/source/glest_game/menu/menu_state_custom_game.h b/source/glest_game/menu/menu_state_custom_game.h index fb01db5c..fa985208 100644 --- a/source/glest_game/menu/menu_state_custom_game.h +++ b/source/glest_game/menu/menu_state_custom_game.h @@ -97,8 +97,8 @@ private: GraphicLabel labelNetworkPauseGameForLaggedClients; GraphicListBox listBoxNetworkPauseGameForLaggedClients; - GraphicLabel labelPathFinderType; - GraphicListBox listBoxPathFinderType; + //GraphicLabel labelPathFinderType; + //GraphicListBox listBoxPathFinderType; GraphicLabel labelMapFilter; GraphicListBox listBoxMapFilter;