Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- another keyboard bugfix (pressing esc properly cancels chat mode), Thanks ultifd

This commit is contained in:
Mark Vejvoda 2011-03-12 03:10:07 +00:00
parent 9d2e08a8c7
commit f88836203a
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/game/chat_manager.cpp
View File

@ -58,8 +58,7 @@ void ChatManager::keyUp(char key) {
if(editEnabled) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,key,key);
if(key == vkEscape)
{
if(key == vkEscape || key == SDLK_ESCAPE) {
text.clear();
editEnabled= false;
}

2
source/glest_game/main/battle_end.cpp
View File

@ -208,7 +208,7 @@ void BattleEnd::render(){
void BattleEnd::keyDown(char key){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(key == vkEscape) {
if(key == vkEscape || key == SDLK_ESCAPE) {
//program->setState(new MainMenu(program));
if(mainMessageBox.getEnabled()) {

2
source/glest_game/main/program.cpp
View File

@ -187,7 +187,7 @@ void Program::keyDown(char key){
if(msgBox.getEnabled()) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(key == vkEscape || key == vkReturn) {
if(key == vkEscape || key == SDLK_ESCAPE || key == vkReturn || key == SDLK_RETURN || key == SDLK_KP_ENTER) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
msgBox.setEnabled(false);