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

no screenshots when using hotkeys for listboxes

Browse Source
This commit is contained in:
Titus Tscharntke
2012-11-14 23:51:18 +00:00
parent 490c538086
commit dc88090b5d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1053,6 +1053,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton) {
//printf("lastKey = %d [%c]\n",lastKey,lastKey); //printf("lastKey = %d [%c]\n",lastKey,lastKey);
advanceToItemStartingWith = lastKey; advanceToItemStartingWith = lastKey;
} }
if(activeInputLabel!=NULL && !(activeInputLabel->mouseClick(x,y))){ if(activeInputLabel!=NULL && !(activeInputLabel->mouseClick(x,y))){
setActiveInputLabel(NULL); setActiveInputLabel(NULL);
} }
@@ -1380,7 +1381,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton) {
} }
} }
} }
else if(listBoxFactions[i].mouseClick(x, y)) { else if(listBoxFactions[i].mouseClick(x, y,advanceToItemStartingWith)) {
// Disallow CPU players to be observers // Disallow CPU players to be observers
if(factionFiles[listBoxFactions[i].getSelectedItemIndex()] == formatString(GameConstants::OBSERVER_SLOTNAME) && if(factionFiles[listBoxFactions[i].getSelectedItemIndex()] == formatString(GameConstants::OBSERVER_SLOTNAME) &&
(listBoxControls[i].getSelectedItemIndex() == ctCpuEasy || listBoxControls[i].getSelectedItemIndex() == ctCpu || (listBoxControls[i].getSelectedItemIndex() == ctCpuEasy || listBoxControls[i].getSelectedItemIndex() == ctCpu ||
@@ -3936,7 +3937,8 @@ void MenuStateCustomGame::keyDown(SDL_KeyboardEvent key) {
if(hasNetworkGameSettings() == true) { if(hasNetworkGameSettings() == true) {
chatManager.keyDown(key); chatManager.keyDown(key);
} }
if(chatManager.getEditEnabled() == false) { if(chatManager.getEditEnabled() == false &&
(Shared::Platform::Window::isKeyStateModPressed(KMOD_SHIFT) == false) ) {
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys)); Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
//if(key == configKeys.getCharKey("ShowFullConsole")) { //if(key == configKeys.getCharKey("ShowFullConsole")) {