--- a/gameServer/Actions.hs	Thu Mar 01 14:45:42 2012 -0500
+++ b/gameServer/Actions.hs	Thu Mar 01 23:55:19 2012 +0400
@@ -38,6 +38,7 @@
     | RemoveTeam B.ByteString
     | SendTeamRemovalMessage B.ByteString
     | RemoveRoom
+    | FinishGame
     | UnreadyRoomClients
     | JoinLobby
     | ProtocolError B.ByteString
@@ -250,6 +251,7 @@
     chans <- liftM (map sendChan) $! sameProtoClientsS proto
     processAction $ AnswerClients chans ("ROOM" : "UPD" : oldRoomName : roomInfo (nick newMaster) newRoom)
 
+    
 processAction (AddRoom roomName roomPassword) = do
     Just clId <- gets clientIndex
     rnc <- gets roomsClients
@@ -292,7 +294,7 @@
     io $ removeRoom rnc ri
 
 
-processAction (UnreadyRoomClients) = do
+processAction UnreadyRoomClients = do
     rnc <- gets roomsClients
     ri <- clientRoomA
     roomPlayers <- roomClientsS ri
@@ -304,7 +306,26 @@
     where
         notReadyMessage p nicks = if p < 38 then "NOT_READY" : nicks else "CLIENT_FLAGS" : "-r" : nicks
 
+        
+processAction FinishGame = do
+    rnc <- gets roomsClients
+    ri <- clientRoomA
+    thisRoomChans <- liftM (map sendChan) $ roomClientsS ri
+    clNick <- client's nick
+    answerRemovedTeams <- io $ 
+         room'sM rnc (map (\t -> AnswerClients thisRoomChans ["REMOVE_TEAM", t]) . leftTeams . fromJust . gameInfo) ri
+    
+    mapM_ processAction $ SaveReplay
+        : ModifyRoom
+            (\r -> r{
+                gameInfo = Nothing,
+                readyPlayers = 0
+                }
+            )
+        : UnreadyRoomClients
+        : answerRemovedTeams
 
+        
 processAction (SendTeamRemovalMessage teamName) = do
     chans <- othersChans
     mapM_ processAction [
@@ -316,6 +337,12 @@
                 }) $ gameInfo r
             })
         ]
+        
+    rnc <- gets roomsClients
+    ri <- clientRoomA
+    gi <- io $ room'sM rnc gameInfo ri
+    when (isJust gi && 0 == teamsInGameNumber (fromJust gi)) $
+        processAction FinishGame        
     where
         rmTeamMsg = toEngineMsg $ 'F' `B.cons` teamName
     

--- a/gameServer/HWProtoInRoomState.hs	Thu Mar 01 14:45:42 2012 -0500
+++ b/gameServer/HWProtoInRoomState.hs	Thu Mar 01 23:55:19 2012 +0400
@@ -209,22 +209,11 @@
     clId <- asks fst
     cl <- thisClient
     rm <- thisRoom
-    chans <- roomClientsChans
     let clTeams = map teamname . filter (\t -> teamowner t == nick cl) . teams $ rm
-    let isLastPlayer = (teamsInGameNumber . fromJust . gameInfo $ rm) == length clTeams
 
     if isJust $ gameInfo rm then
-        if (isMaster cl && isCorrect) || isLastPlayer then
-            return $
-                SaveReplay
-                : ModifyRoom
-                    (\r -> r{
-                        gameInfo = Nothing,
-                        readyPlayers = 0
-                        }
-                    )
-                : UnreadyRoomClients
-                : answerRemovedTeams chans rm
+        if (isMaster cl && isCorrect) then
+            return [FinishGame]
             else if not isCorrect then
                 return $ map SendTeamRemovalMessage clTeams
                 else
@@ -232,7 +221,6 @@
         else
         return []
     where
-        answerRemovedTeams chans = map (\t -> AnswerClients chans ["REMOVE_TEAM", t]) . leftTeams . fromJust . gameInfo
         isCorrect = correctly == "1"
 
 -- compatibility with clients with protocol < 38