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

This commit is contained in:
lotodore
2011-10-03 08:03:58 +00:00
parent f8c89304d1
commit aee0adbffe
123 changed files with 766 additions and 535 deletions
+2 -4
View File
@@ -982,8 +982,7 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost:
InitMessage_t *netInit = &init->GetMsg()->choice.initMessage;
netInit->requestedVersion.major = NET_VERSION_MAJOR;
netInit->requestedVersion.minor = NET_VERSION_MINOR;
if (!context.GetSessionGuid().empty())
{
if (!context.GetSessionGuid().empty()) {
netInit->myLastSessionId =
OCTET_STRING_new_fromBuf(
&asn_DEF_OCTET_STRING,
@@ -1499,8 +1498,7 @@ ClientStateWaitStart::InternalHandlePacket(boost::shared_ptr<ClientThread> clien
StartData startData;
startData.startDealerPlayerId = netGameStart->startDealerPlayerId;
if (netGameStart->gameStartMode.present == gameStartMode_PR_gameStartModeInitial)
{
if (netGameStart->gameStartMode.present == gameStartMode_PR_gameStartModeInitial) {
GameStartModeInitial_t *netStartModeInitial = &netGameStart->gameStartMode.choice.gameStartModeInitial;
startData.numberOfPlayers = netStartModeInitial->playerSeats.list.count;
client->SetStartData(startData);