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.
Okay, let's try not trust even room admin on this
authorunc0rr
Tue, 22 Jan 2013 00:24:44 +0400
changeset 8422 ec41194d4444
parent 8421 fc39fe044a4f
child 8423 8aa450f6cf2c
Okay, let's try not trust even room admin on this
gameServer/Actions.hs file | annotate | diff | comparison | revisions
gameServer/HWProtoInRoomState.hs file | annotate | diff | comparison | revisions 
--- a/gameServer/Actions.hs	Tue Jan 22 00:04:09 2013 +0400
+++ b/gameServer/Actions.hs	Tue Jan 22 00:24:44 2013 +0400
@@ -383,7 +383,7 @@
     rnc <- gets roomsClients
     ri <- clientRoomA
     gi <- io $ room'sM rnc gameInfo ri
-    when (isJust gi && 0 == teamsInGameNumber (fromJust gi)) $
+    when (0 == teamsInGameNumber (fromJust gi)) $
         processAction FinishGame
     where
         rmTeamMsg = toEngineMsg $ 'F' `B.cons` teamName
--- a/gameServer/HWProtoInRoomState.hs	Tue Jan 22 00:04:09 2013 +0400
+++ b/gameServer/HWProtoInRoomState.hs	Tue Jan 22 00:24:44 2013 +0400
@@ -234,10 +234,7 @@
 
     if isInGame cl then
         if isJust $ gameInfo rm then
-            if (isMaster cl && isCorrect) then
-                return $ FinishGame : unsetInGameState
-                else
-                return $ unsetInGameState ++ map SendTeamRemovalMessage clTeams
+            return $ unsetInGameState ++ map SendTeamRemovalMessage clTeams
             else
             return unsetInGameState
         else
hedgewars