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 w/ trunk 0.9.18
authornemo
Wed, 31 Oct 2012 15:31:18 -0400
branch0.9.18
changeset 7906 aea103d58d83
parent 7905 15577789ab8b (current diff)
parent 7898 ba735701ce7f (diff)
child 7907 3b44ecf91928
child 7908 7e52d5a655f1
merge w/ trunk
--- a/gameServer/Actions.hs	Wed Oct 31 15:29:16 2012 -0400
+++ b/gameServer/Actions.hs	Wed Oct 31 15:31:18 2012 -0400
@@ -211,7 +211,7 @@
     rnc <- gets roomsClients
 
     io $ do
-        modifyClient rnc (\cl -> cl{teamsInGame = 0, isReady = False, isMaster = False}) ci
+        modifyClient rnc (\cl -> cl{teamsInGame = 0, isReady = False, isMaster = False, isInGame = False}) ci
         modifyRoom rnc (\r -> r{playersIn = playersIn r + 1}) ri
         moveClientToRoom rnc ri ci
hedgewars