Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gameServer/ServerCore.hs
changeset 1841 fba7210b438b
parent 1839 5dd4cb7fd7e5
child 1926 cb46fbdcaa41 
--- a/gameServer/ServerCore.hs	Tue Feb 24 21:47:17 2009 +0000
+++ b/gameServer/ServerCore.hs	Wed Feb 25 17:12:32 2009 +0000
@@ -19,10 +19,8 @@
 firstAway (_, a, b, c) = (a, b, c)
 
 reactCmd :: ServerInfo -> Int -> [String] -> Clients -> Rooms -> IO (ServerInfo, Clients, Rooms)
-reactCmd serverInfo clID cmd clients rooms = do
-	(_ , serverInfo, clients, rooms) <-
-		foldM processAction (clID, serverInfo, clients, rooms) $ handleCmd clID clients rooms cmd
-	return (serverInfo, clients, rooms)
+reactCmd serverInfo clID cmd clients rooms =
+	liftM firstAway $ foldM processAction (clID, serverInfo, clients, rooms) $ handleCmd clID clients rooms cmd
 
 mainLoop :: ServerInfo -> Clients -> Rooms -> IO ()
 mainLoop serverInfo clients rooms = do
@@ -33,10 +31,9 @@
 			Accept ci -> do
 				let updatedClients = IntMap.insert (clientUID ci) ci clients
 				infoM "Clients" ("New client: id " ++ (show $ clientUID ci))
-				processAction
+				liftM firstAway $ processAction
 					(clientUID ci, serverInfo, updatedClients, rooms)
 					(AnswerThisClient ["CONNECTED", "Hedgewars server http://www.hedgewars.org/"])
-				return (serverInfo, updatedClients, rooms)
 
 			ClientMessage (clID, cmd) -> do
 				debugM "Clients" $ (show clID) ++ ": " ++ (show cmd)
hedgewars