diff --git a/mk/shared/glest.ini b/mk/shared/glest.ini index 873cd622c..a81015201 100644 --- a/mk/shared/glest.ini +++ b/mk/shared/glest.ini @@ -56,6 +56,8 @@ FontMenuNormalPrefix=-*-arial-*-r-*-*- FontMenuVeryBigBaseSize=25 FontSizeAdjustment=0 FONT_HEIGHT_TEXT=yW +IRCServer=irc.freenode.net +IRCChannel=#glest-lobby Lang=english MaxLights=8 Masterserver=http://master.megaglest.org/ diff --git a/mk/windows/glest.ini b/mk/windows/glest.ini index 258aebf88..5f195a37d 100644 --- a/mk/windows/glest.ini +++ b/mk/windows/glest.ini @@ -56,7 +56,8 @@ FontMenuNormalPrefix=-*-arial-*-r-*-*- FontMenuVeryBigBaseSize=25 FontSizeAdjustment=0 FONT_HEIGHT_TEXT=yW -InternetGamesBlockScenario=lobby_access +IRCServer=irc.freenode.net +IRCChannel=#glest-lobby Lang=english MaxLights=8 Masterserver=http://master.megaglest.org/ diff --git a/source/game/menu/menu_state_masterserver.cpp b/source/game/menu/menu_state_masterserver.cpp index 1fb08d65c..c053a9f33 100644 --- a/source/game/menu/menu_state_masterserver.cpp +++ b/source/game/menu/menu_state_masterserver.cpp @@ -43,8 +43,8 @@ using namespace Shared; namespace Game { DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL; - static string IRC_SERVER = "irc.freenode.net"; - static string IRC_CHANNEL = "#glest-lobby"; + static string IRC_SERVER; + static string IRC_CHANNEL; // ===================================================== // class MenuStateMasterserver @@ -316,9 +316,7 @@ namespace Game { updateFromMasterserverThread->setUniqueID(mutexOwnerId); updateFromMasterserverThread->start(); - if (Config::getInstance().getString("IRCServer", "") != "") { - IRC_SERVER = Config::getInstance().getString("IRCServer"); - } + IRC_SERVER = Config::getInstance().getString("IRCServer", "irc.freenode.net"); ircArgs.push_back(IRC_SERVER); if (Config::getInstance().getString("IRCNick", "") != "") { @@ -327,9 +325,7 @@ namespace Game { ircArgs.push_back(szIRCNick); } - if (Config::getInstance().getString("IRCChannel", "") != "") { - IRC_CHANNEL = Config::getInstance().getString("IRCChannel"); - } + IRC_CHANNEL = Config::getInstance().getString("IRCChannel", "#glest-lobby"); ircArgs.push_back(IRC_CHANNEL); if (Config::getInstance().getString("IRCUsername", "") != "") {