diff -r 450ca0afcd58 -r 9be6693c78cb gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Thu Feb 25 15:58:44 2010 +0000 +++ b/gameServer/CoreTypes.hs Thu Feb 25 18:28:33 2010 +0000 @@ -14,160 +14,160 @@ data ClientInfo = - ClientInfo - { - clientUID :: !Int, - sendChan :: Chan [String], - clientHandle :: Handle, - host :: String, - connectTime :: UTCTime, - nick :: String, - webPassword :: String, - logonPassed :: Bool, - clientProto :: !Word16, - roomID :: !Int, - pingsQueue :: !Word, - isMaster :: Bool, - isReady :: Bool, - isAdministrator :: Bool, - clientClan :: String, - teamsInGame :: Word - } + ClientInfo + { + clientUID :: !Int, + sendChan :: Chan [String], + clientHandle :: Handle, + host :: String, + connectTime :: UTCTime, + nick :: String, + webPassword :: String, + logonPassed :: Bool, + clientProto :: !Word16, + roomID :: !Int, + pingsQueue :: !Word, + isMaster :: Bool, + isReady :: Bool, + isAdministrator :: Bool, + clientClan :: String, + teamsInGame :: Word + } instance Show ClientInfo where - show ci = show (clientUID ci) - ++ " nick: " ++ (nick ci) - ++ " host: " ++ (host ci) + show ci = show (clientUID ci) + ++ " nick: " ++ (nick ci) + ++ " host: " ++ (host ci) instance Eq ClientInfo where - (==) = (==) `on` clientHandle + (==) = (==) `on` clientHandle data HedgehogInfo = - HedgehogInfo String String + HedgehogInfo String String data TeamInfo = - TeamInfo - { - teamownerId :: !Int, - teamowner :: String, - teamname :: String, - teamcolor :: String, - teamgrave :: String, - teamfort :: String, - teamvoicepack :: String, - teamflag :: String, - difficulty :: Int, - hhnum :: Int, - hedgehogs :: [HedgehogInfo] - } + TeamInfo + { + teamownerId :: !Int, + teamowner :: String, + teamname :: String, + teamcolor :: String, + teamgrave :: String, + teamfort :: String, + teamvoicepack :: String, + teamflag :: String, + difficulty :: Int, + hhnum :: Int, + hedgehogs :: [HedgehogInfo] + } data RoomInfo = - RoomInfo - { - roomUID :: !Int, - masterID :: !Int, - name :: String, - password :: String, - roomProto :: Word16, - teams :: [TeamInfo], - gameinprogress :: Bool, - playersIn :: !Int, - readyPlayers :: !Int, - playersIDs :: IntSet.IntSet, - isRestrictedJoins :: Bool, - isRestrictedTeams :: Bool, - roundMsgs :: Seq String, - leftTeams :: [String], - teamsAtStart :: [TeamInfo], - params :: Map.Map String [String] - } + RoomInfo + { + roomUID :: !Int, + masterID :: !Int, + name :: String, + password :: String, + roomProto :: Word16, + teams :: [TeamInfo], + gameinprogress :: Bool, + playersIn :: !Int, + readyPlayers :: !Int, + playersIDs :: IntSet.IntSet, + isRestrictedJoins :: Bool, + isRestrictedTeams :: Bool, + roundMsgs :: Seq String, + leftTeams :: [String], + teamsAtStart :: [TeamInfo], + params :: Map.Map String [String] + } instance Show RoomInfo where - show ri = show (roomUID ri) - ++ ", players ids: " ++ show (IntSet.size $ playersIDs ri) - ++ ", players: " ++ show (playersIn ri) - ++ ", ready: " ++ show (readyPlayers ri) + show ri = show (roomUID ri) + ++ ", players ids: " ++ show (IntSet.size $ playersIDs ri) + ++ ", players: " ++ show (playersIn ri) + ++ ", ready: " ++ show (readyPlayers ri) instance Eq RoomInfo where - (==) = (==) `on` roomUID + (==) = (==) `on` roomUID newRoom = ( - RoomInfo - 0 - 0 - "" - "" - 0 - [] - False - 0 - 0 - IntSet.empty - False - False - Data.Sequence.empty - [] - [] - (Map.singleton "MAP" ["+rnd+"]) - ) + RoomInfo + 0 + 0 + "" + "" + 0 + [] + False + 0 + 0 + IntSet.empty + False + False + Data.Sequence.empty + [] + [] + (Map.singleton "MAP" ["+rnd+"]) + ) data StatisticsInfo = - StatisticsInfo - { - playersNumber :: Int, - roomsNumber :: Int - } + StatisticsInfo + { + playersNumber :: Int, + roomsNumber :: Int + } data ServerInfo = - ServerInfo - { - isDedicated :: Bool, - serverMessage :: String, - serverMessageForOldVersions :: String, - listenPort :: PortNumber, - nextRoomID :: Int, - dbHost :: String, - dbLogin :: String, - dbPassword :: String, - lastLogins :: [(String, UTCTime)], - stats :: TMVar StatisticsInfo, - coreChan :: Chan CoreMessage, - dbQueries :: Chan DBQuery - } + ServerInfo + { + isDedicated :: Bool, + serverMessage :: String, + serverMessageForOldVersions :: String, + listenPort :: PortNumber, + nextRoomID :: Int, + dbHost :: String, + dbLogin :: String, + dbPassword :: String, + lastLogins :: [(String, UTCTime)], + stats :: TMVar StatisticsInfo, + coreChan :: Chan CoreMessage, + dbQueries :: Chan DBQuery + } instance Show ServerInfo where - show si = "Server Info" + show si = "Server Info" newServerInfo = ( - ServerInfo - True - "

http://www.hedgewars.org/

" - "

Hedgewars 0.9.12 is out! Please update.

Download page here" - 46631 - 0 - "" - "" - "" - [] - ) + ServerInfo + True + "

http://www.hedgewars.org/

" + "

Hedgewars 0.9.12 is out! Please update.

Download page here" + 46631 + 0 + "" + "" + "" + [] + ) data AccountInfo = - HasAccount String Bool - | Guest - | Admin - deriving (Show, Read) + HasAccount String Bool + | Guest + | Admin + deriving (Show, Read) data DBQuery = - CheckAccount Int String String - | ClearCache - | SendStats Int Int - deriving (Show, Read) + CheckAccount Int String String + | ClearCache + | SendStats Int Int + deriving (Show, Read) data CoreMessage = - Accept ClientInfo - | ClientMessage (Int, [String]) - | ClientAccountInfo (Int, AccountInfo) - | TimerAction Int + Accept ClientInfo + | ClientMessage (Int, [String]) + | ClientAccountInfo (Int, AccountInfo) + | TimerAction Int type Clients = IntMap.IntMap ClientInfo type Rooms = IntMap.IntMap RoomInfo