diff --git a/src/game_defs.h b/src/game_defs.h index 7c955413..abef08e6 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -32,8 +32,8 @@ #define POKERTH_VERSION_MINOR 90 #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) -#define POKERTH_BETA_REVISION 1 -#define POKERTH_BETA_RELEASE_STRING "0.9 alpha" +#define POKERTH_BETA_REVISION 2 +#define POKERTH_BETA_RELEASE_STRING "0.9 beta1" #define RANKING_GAME_START_CASH 10000 #define RANKING_GAME_NUMBER_OF_PLAYERS 10 diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index 1aed10f0..7f724d8d 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -97,6 +97,9 @@ ServerGame::AddSession(boost::shared_ptr session) void ServerGame::RemovePlayer(unsigned playerId, unsigned errorCode) { + if (errorCode == ERR_NET_PLAYER_KICKED) { + MarkPlayerAsKicked(playerId); + } boost::shared_ptr tmpSession = GetSessionManager().GetSessionByUniquePlayerId(playerId); // Only kick if the player was found. if (tmpSession) @@ -373,7 +376,7 @@ ServerGame::InternalEndGame() } void -ServerGame::InternalKickPlayer(unsigned playerId) +ServerGame::MarkPlayerAsKicked(unsigned playerId) { // Mark the player as kicked in the engine. if (m_game) { @@ -384,6 +387,12 @@ ServerGame::InternalKickPlayer(unsigned playerId) tmpPlayer->setMyGuid(""); } } +} + +void +ServerGame::InternalKickPlayer(unsigned playerId) +{ + MarkPlayerAsKicked(playerId); // Kick the network session from this game. boost::shared_ptr tmpSession(GetSessionManager().GetSessionByUniquePlayerId(playerId)); diff --git a/src/net/netpacket.h b/src/net/netpacket.h index 794a72b4..772282dd 100644 --- a/src/net/netpacket.h +++ b/src/net/netpacket.h @@ -27,7 +27,7 @@ #include #define NET_VERSION_MAJOR 2 -#define NET_VERSION_MINOR 0 +#define NET_VERSION_MINOR 1 #define MAX_FILE_DATA_SIZE 256 #define MAX_PACKET_SIZE 384 diff --git a/src/net/servergame.h b/src/net/servergame.h index 69f122c9..97628044 100644 --- a/src/net/servergame.h +++ b/src/net/servergame.h @@ -115,6 +115,7 @@ protected: void RemoveAutoLeavePlayers(); void InternalEndGame(); + void MarkPlayerAsKicked(unsigned playerId); void InternalKickPlayer(unsigned playerId); void InternalAskVoteKick(boost::shared_ptr byWhom, unsigned playerIdWho, unsigned timeoutSec); void InternalDenyAskVoteKick(boost::shared_ptr byWhom, unsigned playerIdWho, DenyKickPlayerReason reason); diff --git a/tests/src/pokerth_protocol/PlayerResult.java b/tests/src/pokerth_protocol/PlayerResult.java index af40b2b9..f39fe887 100644 --- a/tests/src/pokerth_protocol/PlayerResult.java +++ b/tests/src/pokerth_protocol/PlayerResult.java @@ -46,7 +46,7 @@ import org.bn.types.*; @ASN1Integer( name = "" ) - @ASN1Element ( name = "cardsValue", isOptional = false , hasTag = false , hasDefaultValue = false ) + @ASN1Element ( name = "cardsValue", isOptional = true , hasTag = false , hasDefaultValue = false ) private Long cardsValue = null; @@ -115,6 +115,10 @@ import org.bn.types.*; } + public boolean isCardsValuePresent () { + return this.cardsValue != null; + } + public void setCardsValue (Long value) { this.cardsValue = value; diff --git a/tests/src/pokerth_protocol/PokerTHMessage.java b/tests/src/pokerth_protocol/PokerTHMessage.java index 584d619d..93a721d3 100644 --- a/tests/src/pokerth_protocol/PokerTHMessage.java +++ b/tests/src/pokerth_protocol/PokerTHMessage.java @@ -274,11 +274,6 @@ import org.bn.types.*; private ResetTimeoutMessage resetTimeoutMessage = null; - @ASN1Element ( name = "afkWarningMessage", isOptional = false , hasTag = false , hasDefaultValue = false ) - - private AfkWarningMessage afkWarningMessage = null; - - @ASN1Element ( name = "reportAvatarMessage", isOptional = false , hasTag = false , hasDefaultValue = false ) private ReportAvatarMessage reportAvatarMessage = null; @@ -411,8 +406,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -540,8 +533,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -669,8 +660,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -798,8 +787,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -927,8 +914,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1056,8 +1041,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1185,8 +1168,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1314,8 +1295,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1443,8 +1422,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1572,8 +1549,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1701,8 +1676,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1830,8 +1803,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -1959,8 +1930,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2088,8 +2057,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2217,8 +2184,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2346,8 +2311,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2475,8 +2438,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2604,8 +2565,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2733,8 +2692,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2862,8 +2819,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -2991,8 +2946,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3120,8 +3073,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3249,8 +3200,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3378,8 +3327,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3507,8 +3454,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3636,8 +3581,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3765,8 +3708,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -3894,8 +3835,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4023,8 +3962,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4152,8 +4089,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4281,8 +4216,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4410,8 +4343,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4539,8 +4470,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4668,8 +4597,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4797,8 +4724,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -4926,8 +4851,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5055,8 +4978,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5184,8 +5105,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5313,8 +5232,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5442,8 +5359,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5571,8 +5486,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5700,8 +5613,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5829,8 +5740,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -5958,8 +5867,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6087,8 +5994,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6216,8 +6121,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6345,8 +6248,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6474,8 +6375,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6603,8 +6502,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6732,8 +6629,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -6861,137 +6756,6 @@ import org.bn.types.*; setTimeoutWarningMessage(null); - setAfkWarningMessage(null); - - setReportAvatarMessage(null); - - setReportAvatarAckMessage(null); - - setErrorMessage(null); - - } - - - - - public AfkWarningMessage getAfkWarningMessage () { - return this.afkWarningMessage; - } - - public boolean isAfkWarningMessageSelected () { - return this.afkWarningMessage != null; - } - - private void setAfkWarningMessage (AfkWarningMessage value) { - this.afkWarningMessage = value; - } - - - public void selectAfkWarningMessage (AfkWarningMessage value) { - this.afkWarningMessage = value; - - setAnnounceMessage(null); - - setInitMessage(null); - - setAuthMessage(null); - - setInitAckMessage(null); - - setAvatarRequestMessage(null); - - setAvatarReplyMessage(null); - - setPlayerListMessage(null); - - setGameListMessage(null); - - setPlayerInfoRequestMessage(null); - - setPlayerInfoReplyMessage(null); - - setSubscriptionRequestMessage(null); - - setJoinGameRequestMessage(null); - - setJoinGameReplyMessage(null); - - setGamePlayerMessage(null); - - setKickPlayerRequestMessage(null); - - setLeaveGameRequestMessage(null); - - setInvitePlayerToGameMessage(null); - - setInviteNotifyMessage(null); - - setRejectGameInvitationMessage(null); - - setRejectInvNotifyMessage(null); - - setStartEventMessage(null); - - setStartEventAckMessage(null); - - setGameStartMessage(null); - - setHandStartMessage(null); - - setPlayersTurnMessage(null); - - setMyActionRequestMessage(null); - - setYourActionRejectedMessage(null); - - setPlayersActionDoneMessage(null); - - setDealFlopCardsMessage(null); - - setDealTurnCardMessage(null); - - setDealRiverCardMessage(null); - - setAllInShowCardsMessage(null); - - setEndOfHandMessage(null); - - setShowMyCardsRequestMessage(null); - - setAfterHandShowCardsMessage(null); - - setEndOfGameMessage(null); - - setPlayerIdChangedMessage(null); - - setAskKickPlayerMessage(null); - - setAskKickDeniedMessage(null); - - setStartKickPetitionMessage(null); - - setVoteKickRequestMessage(null); - - setVoteKickReplyMessage(null); - - setKickPetitionUpdateMessage(null); - - setEndKickPetitionMessage(null); - - setStatisticsMessage(null); - - setChatRequestMessage(null); - - setChatMessage(null); - - setChatRejectMessage(null); - - setDialogMessage(null); - - setTimeoutWarningMessage(null); - - setResetTimeoutMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); @@ -7121,8 +6885,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarAckMessage(null); setErrorMessage(null); @@ -7250,8 +7012,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setErrorMessage(null); @@ -7379,8 +7139,6 @@ import org.bn.types.*; setResetTimeoutMessage(null); - setAfkWarningMessage(null); - setReportAvatarMessage(null); setReportAvatarAckMessage(null); diff --git a/tests/src/pokerth_protocol/ReportAvatarAckMessage.java b/tests/src/pokerth_protocol/ReportAvatarAckMessage.java index 5fc217e3..6a02c433 100644 --- a/tests/src/pokerth_protocol/ReportAvatarAckMessage.java +++ b/tests/src/pokerth_protocol/ReportAvatarAckMessage.java @@ -120,7 +120,7 @@ import org.bn.types.*; - @ASN1Element ( name = "ReportAvatarAckMessage", isOptional = false , hasTag = true, tag = 137, + @ASN1Element ( name = "ReportAvatarAckMessage", isOptional = false , hasTag = true, tag = 136, tagClass = TagClass.Application , hasDefaultValue = false ) private ReportAvatarAckMessageSequenceType value; diff --git a/tests/src/pokerth_protocol/ReportAvatarMessage.java b/tests/src/pokerth_protocol/ReportAvatarMessage.java index e68303ca..6c5f6db9 100644 --- a/tests/src/pokerth_protocol/ReportAvatarMessage.java +++ b/tests/src/pokerth_protocol/ReportAvatarMessage.java @@ -75,7 +75,7 @@ import org.bn.types.*; - @ASN1Element ( name = "ReportAvatarMessage", isOptional = false , hasTag = true, tag = 136, + @ASN1Element ( name = "ReportAvatarMessage", isOptional = false , hasTag = true, tag = 135, tagClass = TagClass.Application , hasDefaultValue = false ) private ReportAvatarMessageSequenceType value; diff --git a/tests/src/pokerth_test/TestBase.java b/tests/src/pokerth_test/TestBase.java index b7ce34c3..0ef5658b 100644 --- a/tests/src/pokerth_test/TestBase.java +++ b/tests/src/pokerth_test/TestBase.java @@ -52,7 +52,7 @@ import javax.xml.parsers.DocumentBuilderFactory; public abstract class TestBase { public final int PROTOCOL_VERSION_MAJOR = 2; - public final int PROTOCOL_VERSION_MINOR = 0; + public final int PROTOCOL_VERSION_MINOR = 1; public final String AuthUser = "user"; public final String AuthPassword = "pencil"; public final String GuestUser = "Guest112233";