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

- moved the hard coded M (more chat text) hotkey to use the already defined hotkey in glestuser.ini

Browse Source
This commit is contained in:
Mark Vejvoda 2010-08-28 01:52:57 +00:00
parent 2ea8b69e22
commit 792150e3dd
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -994,9 +994,11 @@ void MenuStateConnectedGame::keyDown(char key) {
//send key to the chat manager
chatManager.keyDown(key);
if(!chatManager.getEditEnabled()){
if(key=='M'){
showFullConsole= true;
}
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
if(key == configKeys.getCharKey("ShowFullConsole")) {
showFullConsole= true;
}
}
}
}
@ -1029,11 +1031,14 @@ void MenuStateConnectedGame::keyPress(char c) {
void MenuStateConnectedGame::keyUp(char key) {
if(activeInputLabel==NULL) {
chatManager.keyUp(key);
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
if(chatManager.getEditEnabled()){
//send key to the chat manager
chatManager.keyUp(key);
}
else if(key== 'M'){
else if(key== configKeys.getCharKey("ShowFullConsole")) {
showFullConsole= false;
}
}

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

@ -1903,7 +1903,9 @@ void MenuStateCustomGame::keyDown(char key) {
//send key to the chat manager
chatManager.keyDown(key);
if(!chatManager.getEditEnabled()) {
if(key=='M') {
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
if(key == configKeys.getCharKey("ShowFullConsole")) {
showFullConsole= true;
}
}
@ -1940,11 +1942,14 @@ void MenuStateCustomGame::keyPress(char c) {
void MenuStateCustomGame::keyUp(char key) {
if(activeInputLabel==NULL) {
chatManager.keyUp(key);
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
if(chatManager.getEditEnabled()){
//send key to the chat manager
chatManager.keyUp(key);
}
else if(key== 'M'){
else if(key == configKeys.getCharKey("ShowFullConsole")) {
showFullConsole= false;
}
}