From 6b55818ce58e32de77e94b942a372aa73f274436 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 19 Sep 2012 22:16:22 +0000 Subject: [PATCH] - only allow client to chat after they authenticated with server --- .../menu/menu_state_connected_game.cpp | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index deb1a856..6e2e9560 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -2787,7 +2787,13 @@ void MenuStateConnectedGame::keyDown(SDL_KeyboardEvent key) { } else { //send key to the chat manager - chatManager.keyDown(key); + NetworkManager &networkManager= NetworkManager::getInstance(); + ClientInterface *clientInterface = networkManager.getClientInterface(); + if(clientInterface != NULL && + clientInterface->isConnected() == true && + clientInterface->getIntroDone() == true) { + chatManager.keyDown(key); + } if(chatManager.getEditEnabled() == false) { Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); @@ -2874,13 +2880,25 @@ void MenuStateConnectedGame::keyPress(SDL_KeyboardEvent c) { } } else { - chatManager.keyPress(c); + NetworkManager &networkManager= NetworkManager::getInstance(); + ClientInterface *clientInterface = networkManager.getClientInterface(); + if(clientInterface != NULL && + clientInterface->isConnected() == true && + clientInterface->getIntroDone() == true) { + chatManager.keyPress(c); + } } } void MenuStateConnectedGame::keyUp(SDL_KeyboardEvent key) { if(activeInputLabel==NULL) { - chatManager.keyUp(key); + NetworkManager &networkManager= NetworkManager::getInstance(); + ClientInterface *clientInterface = networkManager.getClientInterface(); + if(clientInterface != NULL && + clientInterface->isConnected() == true && + clientInterface->getIntroDone() == true) { + chatManager.keyUp(key); + } Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys));