From 9ee97cb80bb377a56352ca31e11164a8d56b8718 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 5 Apr 2009 21:26:36 +0000 Subject: [PATCH] preparing 0.7 beta 1 --- src/game_defs.h | 2 +- src/gui/qt/startwindow/startwindowimpl.cpp | 2 +- src/session.cpp | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/game_defs.h b/src/game_defs.h index 1a99d6e8..d58684c3 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -33,7 +33,7 @@ #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) #define POKERTH_BETA_REVISION 0 -#define POKERTH_BETA_RELEASE_STRING "0.6.5" +#define POKERTH_BETA_RELEASE_STRING "0.7-beta1" enum ServerNetworkMode { NETWORK_MODE_TCP = 1, diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 261e3b7e..d245b1ea 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -68,7 +68,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c) // setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); // #endif setupUi(this); - this->setWindowTitle(QString(tr("PokerTH %1 - The Open-Source Texas Holdem Engine").arg(POKERTH_BETA_RELEASE_STRING))); + this->setWindowTitle(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); //Widgets Grafiken per Stylesheets setzen QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); diff --git a/src/session.cpp b/src/session.cpp index 08956906..bb584623 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -175,10 +175,13 @@ void Session::startInternetClient() myNetClient = new ClientThread(*myGui, *myAvatarManager); bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0; + myNetClient->Init( - myConfig->readConfigString("InternetServerAddress"), - myConfig->readConfigString("InternetServerListAddress"), - myConfig->readConfigInt("InternetServerConfigMode") == 0, + myConfig->readConfigString("InternetServerAddress"), "pokerth.net/serverlist07.xml.z", 1, +//WARNING this is just for 0.7 beta to connect to testing server ////////////// +// myConfig->readConfigString("InternetServerListAddress"), +// myConfig->readConfigInt("InternetServerConfigMode") == 0, +/////////////////////////////////////////////////////////////////////////////// myConfig->readConfigInt("InternetServerPort"), myConfig->readConfigInt("InternetServerUseIpv6") == 1, myConfig->readConfigInt("InternetServerUseSctp") == 1,