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 2349 ba7a0813c532
parent 2184 f59f80e034b1
child 2867 9be6693c78cb 
--- a/gameServer/ServerCore.hs	Fri Sep 04 07:04:27 2009 +0000
+++ b/gameServer/ServerCore.hs	Fri Sep 04 12:48:44 2009 +0000
@@ -17,7 +17,7 @@
 
 
 timerLoop :: Int -> Chan CoreMessage -> IO()
-timerLoop tick messagesChan = threadDelay (30 * 10^6) >> (writeChan messagesChan $ TimerAction tick) >> timerLoop (tick + 1) messagesChan
+timerLoop tick messagesChan = threadDelay (30 * 10^6) >> writeChan messagesChan (TimerAction tick) >> timerLoop (tick + 1) messagesChan
 
 firstAway (_, a, b, c) = (a, b, c)
 
@@ -31,7 +31,7 @@
 	
 	(newServerInfo, mClients, mRooms) <-
 		case r of
-			Accept ci -> do
+			Accept ci ->
 				liftM firstAway $ processAction
 					(clientUID ci, serverInfo, clients, rooms) (AddClient ci)
 
@@ -57,7 +57,7 @@
 			TimerAction tick ->
 				liftM firstAway $
 					foldM processAction (0, serverInfo, clients, rooms) $
-						PingAll : if even tick then [StatsAction] else []
+						PingAll : [StatsAction | even tick]
 
 
 	{-			let hadRooms = (not $ null rooms) && (null mrooms)
@@ -80,7 +80,7 @@
 	
 	forkIO $ timerLoop 0 $ coreChan serverInfo
 
-	startDBConnection $ serverInfo
+	startDBConnection serverInfo
 
 	forkIO $ mainLoop serverInfo IntMap.empty (IntMap.singleton 0 newRoom)
hedgewars