is beta07 switch for hardcoded channel and server

This commit is contained in:
doitux
2009-04-15 18:02:16 +00:00
parent 992f9ee383
commit 63bb80e168
+13 -4
View File
@@ -37,6 +37,9 @@
#define NET_DEFAULT_GAME "default" #define NET_DEFAULT_GAME "default"
//uncomment for 0.7 beta
// #define POKERTH_IS_07BETA
using namespace std; using namespace std;
Session::Session(GuiInterface *g, ConfigFile *c) Session::Session(GuiInterface *g, ConfigFile *c)
@@ -168,7 +171,11 @@ void Session::startInternetClient()
myConfig->readConfigInt("IRCServerPort"), myConfig->readConfigInt("IRCServerPort"),
myConfig->readConfigInt("IRCServerUseIpv6") == 1, myConfig->readConfigInt("IRCServerUseIpv6") == 1,
myIrcNick, myIrcNick,
myConfig->readConfigString("IRCChannel"), /*"#pokerth-lobby-07beta",*///WARNING this is just for 0.7 beta to connect to testing chat ////////////// #ifdef POKERTH_IS_07BETA
"#pokerth-lobby-07beta",
#else
myConfig->readConfigString("IRCChannel"),
#endif
myConfig->readConfigString("IRCChannelPassword")); myConfig->readConfigString("IRCChannelPassword"));
myClientIrcThread->Run(); myClientIrcThread->Run();
} }
@@ -177,11 +184,13 @@ void Session::startInternetClient()
bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0; bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0;
myNetClient->Init( myNetClient->Init(
myConfig->readConfigString("InternetServerAddress"), /*"pokerth.net/serverlist07.xml.z", 1,*/ myConfig->readConfigString("InternetServerAddress"),
//WARNING this is just for 0.7 beta to connect to testing server ////////////// #ifdef POKERTH_IS_07BETA
"pokerth.net/serverlist07.xml.z", 1,
#else
myConfig->readConfigString("InternetServerListAddress"), myConfig->readConfigString("InternetServerListAddress"),
myConfig->readConfigInt("InternetServerConfigMode") == 0, myConfig->readConfigInt("InternetServerConfigMode") == 0,
/////////////////////////////////////////////////////////////////////////////// #endif
myConfig->readConfigInt("InternetServerPort"), myConfig->readConfigInt("InternetServerPort"),
myConfig->readConfigInt("InternetServerUseIpv6") == 1, myConfig->readConfigInt("InternetServerUseIpv6") == 1,
myConfig->readConfigInt("InternetServerUseSctp") == 1, myConfig->readConfigInt("InternetServerUseSctp") == 1,