From f4b6d9a34a3b710466cb6e9b4e857a25bceb89fb Mon Sep 17 00:00:00 2001 From: lotodore Date: Fri, 26 Mar 2010 22:15:27 +0000 Subject: [PATCH] New game type entry for game data block. --- src/gamedata.h | 15 ++++++++++++++- src/net/common/netpacket.cpp | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/gamedata.h b/src/gamedata.h index a4aad630..1d8fc4a5 100644 --- a/src/gamedata.h +++ b/src/gamedata.h @@ -37,6 +37,14 @@ enum GameMode GAME_MODE_CLOSED }; +enum GameType +{ + GAME_TYPE_NORMAL = 1, + GAME_TYPE_REGISTERED_ONLY, + GAME_TYPE_INVITE_ONLY, + GAME_TYPE_RANKING +}; + enum RaiseIntervalMode { RAISE_ON_HANDNUMBER = 1, @@ -59,7 +67,12 @@ enum AfterManualBlindsMode // For the sake of simplicity, this is a struct. struct GameData { - GameData() : maxNumberOfPlayers(0), startMoney(0), firstSmallBlind(0), raiseIntervalMode(RAISE_ON_HANDNUMBER), raiseSmallBlindEveryHandsValue(8), raiseSmallBlindEveryMinutesValue(1), raiseMode(DOUBLE_BLINDS), afterManualBlindsMode(AFTERMB_DOUBLE_BLINDS), afterMBAlwaysRaiseValue(0), guiSpeed(4), playerActionTimeoutSec(20) {} + GameData() : gameType(GAME_TYPE_NORMAL), maxNumberOfPlayers(0), startMoney(0), + firstSmallBlind(0), raiseIntervalMode(RAISE_ON_HANDNUMBER), + raiseSmallBlindEveryHandsValue(8), raiseSmallBlindEveryMinutesValue(1), + raiseMode(DOUBLE_BLINDS), afterManualBlindsMode(AFTERMB_DOUBLE_BLINDS), + afterMBAlwaysRaiseValue(0), guiSpeed(4), playerActionTimeoutSec(20) {} + GameType gameType; int maxNumberOfPlayers; int startMoney; int firstSmallBlind; diff --git a/src/net/common/netpacket.cpp b/src/net/common/netpacket.cpp index 2045db3e..8615d77b 100644 --- a/src/net/common/netpacket.cpp +++ b/src/net/common/netpacket.cpp @@ -109,6 +109,7 @@ NetPacket::SetGameData(const GameData &inData, NetGameInfo_t *outData) int numManualBlinds = (int)inData.manualBlindsList.size(); + outData->netGameType = inData.gameType; outData->maxNumPlayers = inData.maxNumberOfPlayers; outData->raiseIntervalMode.present = static_cast(inData.raiseIntervalMode); if (inData.raiseIntervalMode == RAISE_ON_HANDNUMBER) @@ -150,6 +151,7 @@ NetPacket::GetGameData(const NetGameInfo_t *inData, GameData &outData) int numManualBlinds = (int)inData->manualBlinds.list.count; + outData.gameType = static_cast(inData->netGameType); outData.maxNumberOfPlayers = inData->maxNumPlayers; outData.raiseIntervalMode = static_cast(inData->raiseIntervalMode.present); outData.raiseSmallBlindEveryHandsValue = outData.raiseSmallBlindEveryMinutesValue = 0;