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

- bugfix for over-riding irc channel and server

This commit is contained in:
Mark Vejvoda 2012-04-12 06:03:21 +00:00
parent f495a41a05
commit 80e1e45ba8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,8 @@ namespace Glest{ namespace Game{
DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL;
static const char *IRC_SERVER = "irc.freenode.net";
static const char *IRC_CHANNEL = "#megaglest-lobby";
static string IRC_SERVER = "irc.freenode.net";
static string IRC_CHANNEL = "#megaglest-lobby";
// =====================================================
// class MenuStateMasterserver
@ -272,11 +272,9 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
updateFromMasterserverThread->start();
if(Config::getInstance().getString("IRCServer","") != "") {
ircArgs.push_back(Config::getInstance().getString("IRCServer"));
}
else {
ircArgs.push_back(IRC_SERVER);
IRC_SERVER = Config::getInstance().getString("IRCServer");
}
ircArgs.push_back(IRC_SERVER);
if(Config::getInstance().getString("IRCNick","") != "") {
ircArgs.push_back(Config::getInstance().getString("IRCNick"));
@ -286,11 +284,9 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
}
if(Config::getInstance().getString("IRCChannel","") != "") {
ircArgs.push_back(Config::getInstance().getString("IRCChannel"));
}
else {
ircArgs.push_back(IRC_CHANNEL);
IRC_CHANNEL = Config::getInstance().getString("IRCChannel");
}
ircArgs.push_back(IRC_CHANNEL);
if(Config::getInstance().getString("IRCUsername","") != "") {
ircArgs.push_back(Config::getInstance().getString("IRCUsername"));