--- a/gameServer/CoreTypes.hs Sat Mar 05 22:39:26 2011 +0300
+++ b/gameServer/CoreTypes.hs Sun Mar 06 21:54:37 2011 +0300
@@ -12,6 +12,7 @@
import Data.Unique
import Control.Exception
import Data.Typeable
+import Data.TConfig
-----------------------
import RoomsAndClients
@@ -123,7 +124,7 @@
roomsNumber :: Int
}
-data ServerInfo c =
+data ServerInfo =
ServerInfo
{
isDedicated :: Bool,
@@ -141,13 +142,13 @@
restartPending :: Bool,
coreChan :: Chan CoreMessage,
dbQueries :: Chan DBQuery,
- serverConfig :: Maybe c
+ serverConfig :: Maybe Conf
}
-instance Show (ServerInfo c) where
+instance Show ServerInfo where
show _ = "Server Info"
-newServerInfo :: Chan CoreMessage -> Chan DBQuery -> Maybe c -> ServerInfo c
+newServerInfo :: Chan CoreMessage -> Chan DBQuery -> Maybe Conf -> ServerInfo
newServerInfo =
ServerInfo
True