Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 0.9.17 server fix
authorunc0rr
Sun, 20 Nov 2011 19:45:40 +0300
changeset 6407 f63b2330147a
parent 6404 789c17eac2fe (current diff)
parent 6403 477034740077 (diff)
child 6409 ca93f38a1aab
Merge with 0.9.17 server fix
--- 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
--- 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"]
hedgewars