logging missing network actions in sqlite; run astyle.

src/net/common/clientstate.cpp

@@ -1642,17 +1642,16 @@ ClientStateWaitHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client
 				boost::shared_ptr<PlayerInterface> tmpPlayer = client->GetGame()->getPlayerByNumber((i + numberDiff) % client->GetStartData().numberOfPlayers);
 				if (!tmpPlayer)
 					throw ClientException(__FILE__, __LINE__, ERR_NET_UNKNOWN_PLAYER_ID, 0);
-				switch (*seatState)
-				{
-					case NetPlayerState_playerStateNormal :
-						tmpPlayer->setIsSessionActive(true);
-						break;
-					case NetPlayerState_playerStateSessionInactive :
-						tmpPlayer->setIsSessionActive(false);
-						break;
-					case NetPlayerState_playerStateNoMoney :
-						tmpPlayer->setMyCash(0);
-						break;
+				switch (*seatState) {
+				case NetPlayerState_playerStateNormal :
+					tmpPlayer->setIsSessionActive(true);
+					break;
+				case NetPlayerState_playerStateSessionInactive :
+					tmpPlayer->setIsSessionActive(false);
+					break;
+				case NetPlayerState_playerStateNoMoney :
+					tmpPlayer->setMyCash(0);
+					break;
 				}
 			}
 		}

src/net/common/clientthread.cpp

@@ -752,6 +752,11 @@ ClientThread::SetNewGameAdmin(unsigned id)
 	if (playerData.get()) {
 		playerData->SetGameAdmin(true);
 		GetCallback().SignalNetClientNewGameAdmin(id, playerData->GetName());
+		m_clientLog->logPlayerAction(
+			m_game->getCurrentHand()->getCurrentRound(),
+			m_game->getPlayerByUniqueId(id)->getMyID()+1,
+			LOG_ACTION_ADMIN
+		);
 	}
 }
 
@@ -1058,7 +1063,7 @@ ClientThread::CreatePlayerData(unsigned playerId, bool isGameAdmin)
 	if (GetCachedPlayerInfo(playerId, info)) {
 		playerData.reset(
 			new PlayerData(playerId, 0, info.ptype,
-							info.isGuest ? PLAYER_RIGHTS_GUEST : PLAYER_RIGHTS_NORMAL, isGameAdmin));
+						   info.isGuest ? PLAYER_RIGHTS_GUEST : PLAYER_RIGHTS_NORMAL, isGameAdmin));
 		playerData->SetName(info.playerName);
 		if (info.hasAvatar) {
 			string avatarFile;
@@ -1118,6 +1123,21 @@ ClientThread::RemovePlayerData(unsigned playerId, int removeReason)
 			}
 		}
 		GetCallback().SignalNetClientPlayerLeft(tmpData->GetUniqueId(), tmpData->GetName(), removeReason);
+
+		if(removeReason == NTF_NET_REMOVED_KICKED) {
+			m_clientLog->logPlayerAction(
+				m_game->getCurrentHand()->getCurrentRound(),
+				m_game->getPlayerByUniqueId(tmpData->GetUniqueId())->getMyID()+1,
+				LOG_ACTION_KICKED
+			);
+		} else {
+			m_clientLog->logPlayerAction(
+				m_game->getCurrentHand()->getCurrentRound(),
+				m_game->getPlayerByUniqueId(tmpData->GetUniqueId())->getMyID()+1,
+				LOG_ACTION_LEFT
+			);
+		}
+
 	}
 }
 

src/net/common/servergamestate.cpp

@@ -949,11 +949,10 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr<ServerGame> server)
 				server->GetStateTimer1().async_wait(
 					boost::bind(
 						&ServerGameStateHand::TimerComputerAction, this, boost::asio::placeholders::error, server));
-			}
-			else {
+			} else {
 				// If the player we are waiting for left, continue without him.
 				if (!server->GetSessionManager().IsPlayerConnected(curPlayer->getMyUniqueID())
-					|| !curPlayer->isSessionActive()) {
+						|| !curPlayer->isSessionActive()) {
 					PerformPlayerAction(*server, curPlayer, PLAYER_ACTION_FOLD, 0);
 
 					server->GetStateTimer1().expires_from_now(
@@ -1290,7 +1289,7 @@ ServerGameStateHand::CheckPlayerTimeouts(boost::shared_ptr<ServerGame> server)
 		while (i != end) {
 			boost::shared_ptr<PlayerInterface> tmpPlayer = *i;
 			if (tmpPlayer->getMyType() == PLAYER_TYPE_HUMAN
-				&& (int)tmpPlayer->getTimeSecSinceLastRemoteAction() >= actionTimeout * SERVER_GAME_AUTOFOLD_TIMEOUT_FACTOR) {
+					&& (int)tmpPlayer->getTimeSecSinceLastRemoteAction() >= actionTimeout * SERVER_GAME_AUTOFOLD_TIMEOUT_FACTOR) {
 				if (tmpPlayer->isSessionActive()) {
 					tmpPlayer->setIsSessionActive(false);
 					boost::shared_ptr<SessionData> session = server->GetSessionManager().GetSessionByUniquePlayerId(tmpPlayer->getMyUniqueID());

src/net/common/serverlobbythread.cpp

@@ -881,7 +881,7 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr<SessionData> session, boost::s
 			else if (packet->GetMsg()->present == PokerTHMessage_PR_avatarRequestMessage)
 				HandleNetPacketRetrieveAvatar(session, packet->GetMsg()->choice.avatarRequestMessage);
 			else if (packet->GetMsg()->present == PokerTHMessage_PR_resetTimeoutMessage)
-			{}
+				{}
 			else if (packet->GetMsg()->present == PokerTHMessage_PR_subscriptionRequestMessage) {
 				SubscriptionRequestMessage_t *subscriptionRequest = &packet->GetMsg()->choice.subscriptionRequestMessage;
 				if (subscriptionRequest->subscriptionAction == subscriptionAction_resubscribeGameList)