# HG changeset patch
# User unc0rr
# Date 1321807540 -10800
# Node ID f63b2330147a2ae9e7ff4d2ed776aaf4608e9d5d
# Parent  789c17eac2fe1b956e2786aa05f3aca62b4ffc81# Parent  4770347400776431c7bc9a233350d39741b0b0de
Merge with 0.9.17 server fix

diff -r 789c17eac2fe -r f63b2330147a gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs	Sat Nov 19 15:36:33 2011 -0500
+++ b/gameServer/CoreTypes.hs	Sun Nov 20 19:45:40 2011 +0300
@@ -79,7 +79,6 @@
     GameInfo
         Data.Sequence.empty
         []
-        []
 
 data RoomInfo =
     RoomInfo
diff -r 789c17eac2fe -r f63b2330147a gameServer/HWProtoInRoomState.hs
--- a/gameServer/HWProtoInRoomState.hs	Sat Nov 19 15:36:33 2011 -0500
+++ b/gameServer/HWProtoInRoomState.hs	Sun Nov 20 19:45:40 2011 +0300
@@ -179,7 +179,7 @@
             return [
                 ModifyRoom
                     (\r -> r{
-                        gameInfo = Just $ newGameInfo allPlayersRegistered (mapParams rm) (params rm)
+                        gameInfo = Just $ newGameInfo (teams rm) allPlayersRegistered (mapParams rm) (params rm)
                         }
                     ),
                 AnswerClients chans ["RUN_GAME"]