diff --git a/src/game_defs.h b/src/game_defs.h index 213eaf29..1c1341f5 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -32,8 +32,8 @@ #define POKERTH_VERSION_MINOR 80 #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) -#define POKERTH_BETA_REVISION 3 -#define POKERTH_BETA_RELEASE_STRING "0.8-beta3" +#define POKERTH_BETA_REVISION 0 +#define POKERTH_BETA_RELEASE_STRING "0.8" #define RANKING_GAME_START_CASH 10000 #define RANKING_GAME_NUMBER_OF_PLAYERS 10 diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index 9495cd39..765af861 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -160,6 +160,7 @@ ClientThread::SendPlayerAction() MyActionRequestMessage_t *netMyAction = &packet->GetMsg()->choice.myActionRequestMessage; netMyAction->gameId = GetGameId(); boost::shared_ptr myPlayer = GetGame()->getSeatsList()->front(); + netMyAction->handNum = GetGame()->getCurrentHandID(); netMyAction->gameState = GetGame()->getCurrentHand()->getCurrentRound(); netMyAction->myAction = myPlayer->getMyAction(); // Only send last bet if not fold/checked. diff --git a/src/net/netpacket.h b/src/net/netpacket.h index 8d639d89..123f06e4 100644 --- a/src/net/netpacket.h +++ b/src/net/netpacket.h @@ -27,7 +27,7 @@ #include #include -#define NET_VERSION_MAJOR 6 +#define NET_VERSION_MAJOR 1 #define NET_VERSION_MINOR 0 #define MAX_FILE_DATA_SIZE 256 diff --git a/src/session.cpp b/src/session.cpp index 5c0b2516..31bd92d0 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -165,12 +165,8 @@ void Session::startInternetClient() myNetClient->Init( myConfig->readConfigString("InternetServerAddress"), -#ifdef POKERTH_IS_08BETA - "pokerth.net/serverlist_testing.xml.z", 1, -#else myConfig->readConfigString("InternetServerListAddress"), myConfig->readConfigInt("InternetServerConfigMode") == 0, -#endif myConfig->readConfigInt("InternetServerPort"), myConfig->readConfigInt("InternetServerUseIpv6") == 1, myConfig->readConfigInt("InternetServerUseSctp") == 1, diff --git a/src/session.h b/src/session.h index 03654ad3..79adb76d 100755 --- a/src/session.h +++ b/src/session.h @@ -29,9 +29,6 @@ #include "game_defs.h" #include -//uncomment for 0.8 beta -#define POKERTH_IS_08BETA - class GuiInterface; class Game;