From 897f2b6dd8dd03cc5cc5fa58ac40a6e9a303fbc9 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Sat, 24 Oct 2015 18:45:10 -0700 Subject: [PATCH] - code cleanup, property return value and printf --- source/glest_game/game/game.cpp | 2 +- source/glest_game/menu/menu_state_options.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index 5d844be9..b5843aee 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -4869,7 +4869,7 @@ void Game::keyDown(SDL_KeyboardEvent key) { if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] keyName [%s] group index = %d, key = [%c] [%d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,keyName.c_str(),idx,groupHotKey,groupHotKey); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("input.keysym.mod = %d groupHotKey = %d key = %d (%d) [%s] isgroup = %d\n",key.keysym.mod,groupHotKey,key.keysym.sym,key.keysym.unicode,keyName.c_str(),isKeyPressed(groupHotKey,key)); - if(SystemFlags::VERBOSE_MODE_ENABLED) printf("input.keysym.mod = %d groupHotKey = %d key = (%d) [%s] isgroup = %d\n",key.keysym.mod,groupHotKey,keyName.c_str(),isKeyPressed(groupHotKey,key)); + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("input.keysym.mod = %d groupHotKey = %d key = (%d) [%s] isgroup = %d\n",key.keysym.mod,groupHotKey,key.keysym.sym,keyName.c_str(),isKeyPressed(groupHotKey,key)); //printf("input.keysym.mod = %d groupHotKey = %d key = %d (%d) [%s] isgroup = %d\n",key.keysym.mod,groupHotKey,key.keysym.sym,key.keysym.unicode,keyName.c_str(),isKeyPressed(groupHotKey,key)); //printf("IS GROUP KEY %d scancode:%d sym:%d groupHotKey=%d \n",idx,key.keysym.scancode,key.keysym.sym,groupHotKey); if(key.keysym.sym==groupHotKey){ diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index da6ddea1..d0744481 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -1026,9 +1026,10 @@ bool MenuStateOptions::textInput(std::string text) { &labelTransifexUser == activeInputLabel || &labelTransifexPwd == activeInputLabel || &labelTransifexI18N == activeInputLabel) { - textInputEditLabel(text, &activeInputLabel); + return textInputEditLabel(text, &activeInputLabel); } } + return false; } void MenuStateOptions::keyPress(SDL_KeyboardEvent c) {