# HG changeset patch
# User unc0rr
# Date 1361213262 -14400
# Node ID 896b283f41a2a9af56edbc9096a37b5cb36dbe9b
# Parent  cd85ab23f38be1cdafed2cdaad963d2079a21872
Clear player's clan info on room join

diff -r cd85ab23f38b -r 896b283f41a2 gameServer/Actions.hs
--- a/gameServer/Actions.hs	Mon Feb 18 22:21:31 2013 +0400
+++ b/gameServer/Actions.hs	Mon Feb 18 22:47:42 2013 +0400
@@ -220,7 +220,7 @@
     rnc <- gets roomsClients
 
     io $ do
-        modifyClient rnc (\cl -> cl{teamsInGame = 0, isReady = False, isMaster = False, isInGame = False}) ci
+        modifyClient rnc (\cl -> cl{teamsInGame = 0, isReady = False, isMaster = False, isInGame = False, clientClan = Nothing}) ci
         modifyRoom rnc (\r -> r{playersIn = playersIn r + 1}) ri
         moveClientToRoom rnc ri ci
 
diff -r cd85ab23f38b -r 896b283f41a2 gameServer/HWProtoInRoomState.hs
--- a/gameServer/HWProtoInRoomState.hs	Mon Feb 18 22:21:31 2013 +0400
+++ b/gameServer/HWProtoInRoomState.hs	Mon Feb 18 22:47:42 2013 +0400
@@ -309,7 +309,7 @@
             && isJust maybeClientId
             && (kickId /= thisClientId)
             && sameRoom
-            && ((isNothing $ gameInfo rm) || notOnly2Clans || teamsInGame kickCl = 0)
+            && ((isNothing $ gameInfo rm) || notOnly2Clans || teamsInGame kickCl == 0)
         ]