From d2ee2cfdc8d53d413c1318eb0f9e460b00248caf Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Thu, 24 Jan 2013 20:02:14 +0000 Subject: [PATCH] FrustumPicking in ingame options --- source/glest_game/menu/menu_state_options.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 29e7ffb6e..bea3dd89e 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -199,11 +199,15 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu): listBoxSelectionType.registerGraphicComponent(containerName,"listBoxSelectionType"); listBoxSelectionType.init(currentColumnStart, currentLine, 170); listBoxSelectionType.pushBackItem("SelectBuffer"); - listBoxSelectionType.pushBackItem("Colorpicking"); + listBoxSelectionType.pushBackItem("ColorPicking"); + listBoxSelectionType.pushBackItem("FrustumPicking"); bool isColorpicking= config.getBool("EnableColorPicking","false"); + bool isFrustumPicking=config.getBool("EnableFrustumPicking","false"); bool isSelectBuf= config.getBool("EnableSelectBufPicking","true"); - if( isSelectBuf == true && isColorpicking == false ) + if( isSelectBuf == true && isColorpicking == false && isFrustumPicking == false ) listBoxSelectionType.setSelectedItemIndex(0); + else if(isColorpicking == false && isFrustumPicking == true) + listBoxSelectionType.setSelectedItemIndex(2); else listBoxSelectionType.setSelectedItemIndex(1); currentLine-=lineOffset; @@ -1771,12 +1775,18 @@ void MenuStateOptions::saveConfig(){ int selectionTypeindex= listBoxSelectionType.getSelectedItemIndex(); if(selectionTypeindex==0){ config.setBool("EnableColorPicking", false); + config.setBool("EnableSelectBufPicking", false); config.setBool("EnableSelectBufPicking", true); } - else - { + else if (selectionTypeindex==1){ config.setBool("EnableColorPicking", true); + config.setBool("EnableSelectBufPicking", false); + config.setBool("EnableFrustumPicking", true); + } + else if (selectionTypeindex==2){ + config.setBool("EnableColorPicking", false); config.setBool("EnableSelectBufPicking", true); + config.setBool("EnableFrustumPicking", true); } int index= listBoxShadows.getSelectedItemIndex();