More protocol changes for rejoin. Re-adding server password to protocol.

2011-10-03 08:03:58 +00:00
parent f8c89304d1
commit aee0adbffe
123 changed files with 766 additions and 535 deletions
@@ -60,6 +60,7 @@ PokerTHMessage ::= CHOICE {
 	showMyCardsRequestMessage	ShowMyCardsRequestMessage,
 	afterHandShowCardsMessage	AfterHandShowCardsMessage,
 	endOfGameMessage			EndOfGameMessage,
+	playerIdChangedMessage		PlayerIdChangedMessage,
 	askKickPlayerMessage		AskKickPlayerMessage,
 	askKickDeniedMessage		AskKickDeniedMessage,
 	startKickPetitionMessage	StartKickPetitionMessage,
@@ -97,6 +98,7 @@ InitMessage ::= [APPLICATION 1] SEQUENCE {
 	requestedVersion			Version,
 	buildId						INTEGER,
 	myLastSessionId				Guid OPTIONAL,
+	authServerPassword			UTF8String (SIZE(1..64)) OPTIONAL,
 	login						CHOICE {
 		guestLogin				[0]	GuestLogin,
 		authenticatedLogin		[1]	AuthenticatedLogin,
@@ -287,13 +289,13 @@ JoinGameRequestMessage ::= [APPLICATION 11] SEQUENCE {
 }

 JoinExistingGame ::= SEQUENCE {
-	gameId						NonZeroId
-	password					UTF8String (SIZE(1..64)) OPTIONAL,
+	gameId						NonZeroId,
+	password					UTF8String (SIZE(1..64)) OPTIONAL
 }

 JoinNewGame ::= SEQUENCE {
-	gameInfo					NetGameInfo
-	password					UTF8String (SIZE(1..64)) OPTIONAL,
+	gameInfo					NetGameInfo,
+	password					UTF8String (SIZE(1..64)) OPTIONAL
 }

 RejoinExistingGame ::= SEQUENCE {
@@ -450,6 +452,7 @@ GameStartModeInitial ::= SEQUENCE {
 }

 GameStartModeRejoin ::= SEQUENCE {
+	handNum						NonZeroId,
 	rejoinPlayerData			SEQUENCE SIZE(2..10) OF RejoinPlayerData
 }

@@ -585,6 +588,11 @@ EndOfGameMessage ::= [APPLICATION 35] SEQUENCE {
 	winnerPlayerId				NonZeroId
 }

+PlayerIdChangedMessage ::= [APPLICATION 36] SEQUENCE {
+	oldPlayerId					NonZeroId,
+	newPlayerId					NonZeroId
+}
+
 AskKickPlayerMessage ::= [APPLICATION 64] SEQUENCE {
 	gameId						NonZeroId,
 	playerId					NonZeroId