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

Chat in custom game menu is only active if network slots are open; No more screenshots and debug toggling while chatting in Internet Menu; typo fix

Browse Source
This commit is contained in:
Titus Tscharntke
2011-01-03 12:41:20 +00:00
parent ec77cd9eab
commit 5bb98fa261
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/main/main.cpp
View File

@@ -183,7 +183,7 @@ void stackdumper(unsigned int type, EXCEPTION_POINTERS *ep) {
class ExceptionHandler: public PlatformExceptionHandler{ class ExceptionHandler: public PlatformExceptionHandler{
public: public:
virtual void handle() { virtual void handle() {
string msg = "#1 An error ocurred and " + string(GameConstants::application_name) + " will close.\nPlease report this bug to "+mailString; string msg = "#1 An error occurred and " + string(GameConstants::application_name) + " will close.\nPlease report this bug to "+mailString;
#ifdef WIN32 #ifdef WIN32
msg += ", attaching the generated " + getCrashDumpFileName()+ " file."; msg += ", attaching the generated " + getCrashDumpFileName()+ " file.";
#endif #endif
@@ -366,7 +366,7 @@ public:
} }
} }
else { else {
string err = "#2 An error ocurred and " + string err = "#2 An error occurred and " +
string(GameConstants::application_name) + string(GameConstants::application_name) +
" will close.\nError msg = [" + " will close.\nError msg = [" +
errMsg + errMsg +

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

@@ -1339,7 +1339,9 @@ void MenuStateCustomGame::render() {
} }
} }
if(hasNetworkGameSettings() == true) {
renderer.renderChatManager(&chatManager); renderer.renderChatManager(&chatManager);
}
renderer.renderConsole(&console,showFullConsole,true); renderer.renderConsole(&console,showFullConsole,true);
} }
catch(const std::exception &ex) { catch(const std::exception &ex) {
@@ -2635,7 +2637,9 @@ void MenuStateCustomGame::keyDown(char key) {
} }
else { else {
//send key to the chat manager //send key to the chat manager
if(hasNetworkGameSettings() == true) {
chatManager.keyDown(key); chatManager.keyDown(key);
}
if(chatManager.getEditEnabled() == false) { if(chatManager.getEditEnabled() == false) {
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys)); Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
@@ -2692,20 +2696,25 @@ void MenuStateCustomGame::keyPress(char c) {
} }
} }
else { else {
if(hasNetworkGameSettings() == true) {
chatManager.keyPress(c); chatManager.keyPress(c);
} }
}
} }
void MenuStateCustomGame::keyUp(char key) { void MenuStateCustomGame::keyUp(char key) {
if(activeInputLabel==NULL) { if(activeInputLabel==NULL) {
if(hasNetworkGameSettings() == true) {
chatManager.keyUp(key); chatManager.keyUp(key);
}
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys)); Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
if(chatManager.getEditEnabled()) { if(chatManager.getEditEnabled()) {
//send key to the chat manager //send key to the chat manager
if(hasNetworkGameSettings() == true) {
chatManager.keyUp(key); chatManager.keyUp(key);
} }
}
else if(key == configKeys.getCharKey("ShowFullConsole")) { else if(key == configKeys.getCharKey("ShowFullConsole")) {
showFullConsole= false; showFullConsole= false;
} }

1
source/glest_game/menu/menu_state_masterserver.h
View File

@@ -120,6 +120,7 @@ public:
virtual void keyUp(char key); virtual void keyUp(char key);
virtual void simpleTask(BaseThread *callingThread); virtual void simpleTask(BaseThread *callingThread);
virtual bool isInSpecialKeyCaptureEvent() { return chatManager.getEditEnabled(); }
static void setDisplayMessageFunction(DisplayMessageFunction pDisplayMessage) { pCB_DisplayMessage = pDisplayMessage; } static void setDisplayMessageFunction(DisplayMessageFunction pDisplayMessage) { pCB_DisplayMessage = pDisplayMessage; }