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
authorkoda
Sun, 26 Sep 2010 03:41:30 +0200
changeset 3905 7768ac820d5a
parent 3904 22e4d74240e5 (current diff)
parent 3901 124b4755914b (diff)
child 3906 c5da430cb3fd
merge
--- a/gameServer/CoreTypes.hs	Sun Sep 26 03:41:08 2010 +0200
+++ b/gameServer/CoreTypes.hs	Sun Sep 26 03:41:30 2010 +0200
@@ -31,7 +31,7 @@
         roomID :: RoomIndex,
         pingsQueue :: !Word,
         isMaster :: Bool,
-        isReady :: Bool,
+        isReady :: !Bool,
         isAdministrator :: Bool,
         clientClan :: B.ByteString,
         teamsInGame :: Word
--- a/gameServer/OfficialServer/extdbinterface.hs	Sun Sep 26 03:41:08 2010 +0200
+++ b/gameServer/OfficialServer/extdbinterface.hs	Sun Sep 26 03:41:30 2010 +0200
@@ -1,4 +1,4 @@
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE ScopedTypeVariables, OverloadedStrings #-}
 
 module Main where
 
@@ -26,7 +26,7 @@
     case q of
         CheckAccount clUid clNick _ -> do
                 statement <- prepare dbConn dbQueryAccount
-                execute statement [SqlString $ clNick]
+                execute statement [SqlByteString $ clNick]
                 passAndRole <- fetchRow statement
                 finish statement
                 let response = 
@@ -47,7 +47,7 @@
 
 
 dbConnectionLoop mySQLConnectionInfo =
-    Control.Exception.handle (\(_ :: IOException) -> return ()) $ handleSqlError $
+    Control.Exception.handle (\(e :: IOException) -> hPutStrLn stderr $ show e) $ handleSqlError $
         bracket
             (connectMySQL mySQLConnectionInfo)
             (disconnect)
--- a/gameServer/RoomsAndClients.hs	Sun Sep 26 03:41:08 2010 +0200
+++ b/gameServer/RoomsAndClients.hs	Sun Sep 26 03:41:30 2010 +0200
@@ -13,7 +13,6 @@
     lobbyId,
     moveClientToLobby,
     moveClientToRoom,
-    clientRoom,
     clientRoomM,
     clientExists,
     client,
--- a/gameServer/Store.hs	Sun Sep 26 03:41:08 2010 +0200
+++ b/gameServer/Store.hs	Sun Sep 26 03:41:30 2010 +0200
@@ -93,7 +93,7 @@
 modifyElem :: MStore e -> (e -> e) -> ElemIndex -> IO ()
 modifyElem (MStore ref) f (ElemIndex n) = do
     (_, _, arr) <- readIORef ref
-    IOA.readArray arr n >>= (IOA.writeArray arr n) . f
+    IOA.readArray arr n >>= IOA.writeArray arr n . f
 
 elemExists :: MStore e -> ElemIndex -> IO Bool
 elemExists (MStore ref) (ElemIndex n) = do
hedgewars