mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 20:12:40 +02:00
Code Issues Projects Releases Wiki Activity

IRC server and channel is now in glest.ini

Browse Source
This commit is contained in:
mathusummut
2019-02-02 22:58:43 +01:00
parent 3f085bc148
commit e248eddbf9
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/shared/glest.ini
View File

@@ -56,6 +56,8 @@ FontMenuNormalPrefix=-*-arial-*-r-*-*-
FontMenuVeryBigBaseSize=25 FontMenuVeryBigBaseSize=25
FontSizeAdjustment=0 FontSizeAdjustment=0
FONT_HEIGHT_TEXT=yW FONT_HEIGHT_TEXT=yW
IRCServer=irc.freenode.net
IRCChannel=#glest-lobby
Lang=english Lang=english
MaxLights=8 MaxLights=8
Masterserver=http://master.megaglest.org/ Masterserver=http://master.megaglest.org/

3
mk/windows/glest.ini
View File

@@ -56,7 +56,8 @@ FontMenuNormalPrefix=-*-arial-*-r-*-*-
FontMenuVeryBigBaseSize=25 FontMenuVeryBigBaseSize=25
FontSizeAdjustment=0 FontSizeAdjustment=0
FONT_HEIGHT_TEXT=yW FONT_HEIGHT_TEXT=yW
InternetGamesBlockScenario=lobby_access IRCServer=irc.freenode.net
IRCChannel=#glest-lobby
Lang=english Lang=english
MaxLights=8 MaxLights=8
Masterserver=http://master.megaglest.org/ Masterserver=http://master.megaglest.org/

12
source/game/menu/menu_state_masterserver.cpp
View File

@@ -43,8 +43,8 @@ using namespace Shared;
namespace Game { namespace Game {
DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL; DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL;
static string IRC_SERVER = "irc.freenode.net"; static string IRC_SERVER;
static string IRC_CHANNEL = "#glest-lobby"; static string IRC_CHANNEL;
// ===================================================== // =====================================================
// class MenuStateMasterserver // class MenuStateMasterserver
@@ -316,9 +316,7 @@ namespace Game {
updateFromMasterserverThread->setUniqueID(mutexOwnerId); updateFromMasterserverThread->setUniqueID(mutexOwnerId);
updateFromMasterserverThread->start(); updateFromMasterserverThread->start();
if (Config::getInstance().getString("IRCServer", "") != "") { IRC_SERVER = Config::getInstance().getString("IRCServer", "irc.freenode.net");
IRC_SERVER = Config::getInstance().getString("IRCServer");
}
ircArgs.push_back(IRC_SERVER); ircArgs.push_back(IRC_SERVER);
if (Config::getInstance().getString("IRCNick", "") != "") { if (Config::getInstance().getString("IRCNick", "") != "") {
@@ -327,9 +325,7 @@ namespace Game {
ircArgs.push_back(szIRCNick); ircArgs.push_back(szIRCNick);
} }
if (Config::getInstance().getString("IRCChannel", "") != "") { IRC_CHANNEL = Config::getInstance().getString("IRCChannel", "#glest-lobby");
IRC_CHANNEL = Config::getInstance().getString("IRCChannel");
}
ircArgs.push_back(IRC_CHANNEL); ircArgs.push_back(IRC_CHANNEL);
if (Config::getInstance().getString("IRCUsername", "") != "") { if (Config::getInstance().getString("IRCUsername", "") != "") {