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

No more MG Bot Messages; IRC chatting is disabled until really connected to irc.

Browse Source
This commit is contained in:
Titus Tscharntke
2011-01-02 23:53:59 +00:00
parent 472aa69c5c
commit bcaf400689
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/glest_game/menu/menu_state_masterserver.cpp
View File

@@ -567,8 +567,11 @@ void MenuStateMasterserver::render(){
} }
} }
renderer.renderScrollBar(&userScrollBar); renderer.renderScrollBar(&userScrollBar);
if(ircClient != NULL &&
ircClient->isConnected() == true &&
ircClient->getHasJoinedChannel() == true) {
renderer.renderChatManager(&chatManager); renderer.renderChatManager(&chatManager);
}
renderer.renderConsole(&consoleIRC,true,true); renderer.renderConsole(&consoleIRC,true,true);
} }
@@ -913,6 +916,9 @@ void MenuStateMasterserver::showMessageBox(const string &text, const string &hea
void MenuStateMasterserver::keyDown(char key) { void MenuStateMasterserver::keyDown(char key) {
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys)); Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
if (ircClient != NULL && ircClient->isConnected() == true
&& ircClient->getHasJoinedChannel() == true) {
//chatmanger only if connected to irc!
if (chatManager.getEditEnabled() == true) { if (chatManager.getEditEnabled() == true) {
//printf("keyDown key [%d] chatManager.getText() [%s]\n",key,chatManager.getText().c_str()); //printf("keyDown key [%d] chatManager.getText() [%s]\n",key,chatManager.getText().c_str());
MutexSafeWrapper safeMutexIRCPtr(&mutexIRCClient); MutexSafeWrapper safeMutexIRCPtr(&mutexIRCClient);
@@ -922,6 +928,7 @@ void MenuStateMasterserver::keyDown(char key) {
} }
chatManager.keyDown(key); chatManager.keyDown(key);
}
if(chatManager.getEditEnabled() == false) { if(chatManager.getEditEnabled() == false) {
if(key == configKeys.getCharKey("ToggleMusic")) { if(key == configKeys.getCharKey("ToggleMusic")) {
Config &config = Config::getInstance(); Config &config = Config::getInstance();
@@ -949,9 +956,14 @@ void MenuStateMasterserver::keyDown(char key) {
} }
void MenuStateMasterserver::keyPress(char c) { void MenuStateMasterserver::keyPress(char c) {
if (ircClient != NULL && ircClient->isConnected() == true
&& ircClient->getHasJoinedChannel() == true) {
chatManager.keyPress(c); chatManager.keyPress(c);
} }
}
void MenuStateMasterserver::keyUp(char key) { void MenuStateMasterserver::keyUp(char key) {
if (ircClient != NULL && ircClient->isConnected() == true
&& ircClient->getHasJoinedChannel() == true) {
chatManager.keyUp(key); chatManager.keyUp(key);
if (chatManager.getEditEnabled()) { if (chatManager.getEditEnabled()) {
@@ -959,5 +971,6 @@ void MenuStateMasterserver::keyUp(char key) {
chatManager.keyUp(key); chatManager.keyUp(key);
} }
} }
}
}}//end namespace }}//end namespace

2
source/shared_lib/sources/platform/posix/ircclient.cpp
View File

@@ -78,7 +78,7 @@ void event_join(irc_session_t * session, const char * event, const char * origin
if(ctx != NULL) { if(ctx != NULL) {
if(ctx->getHasJoinedChannel() == false) { if(ctx->getHasJoinedChannel() == false) {
irc_cmd_user_mode (session, "+i"); irc_cmd_user_mode (session, "+i");
irc_cmd_msg (session, params[0], "MG Bot says hello!"); //irc_cmd_msg (session, params[0], "MG Bot says hello!");
ctx->setHasJoinedChannel(true); ctx->setHasJoinedChannel(true);
ctx->GetIRCConnectedNickList(ctx->getArgs()[2],true); ctx->GetIRCConnectedNickList(ctx->getArgs()[2],true);