diff -r da43c36a6e92 -r f11d80bac7ed gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Sun Feb 06 18:59:53 2011 +0300 +++ b/gameServer/CoreTypes.hs Sun Feb 06 21:50:29 2011 +0300 @@ -1,13 +1,10 @@ {-# LANGUAGE OverloadedStrings #-} module CoreTypes where -import System.IO import Control.Concurrent -import Control.Concurrent.Chan import Control.Concurrent.STM import Data.Word import qualified Data.Map as Map -import qualified Data.IntSet as IntSet import Data.Sequence(Seq, empty) import Data.Time import Network @@ -41,7 +38,7 @@ } instance Show ClientInfo where - show ci = " nick: " ++ (unpack $ nick ci) ++ " host: " ++ (unpack $ host ci) + show ci = " nick: " ++ unpack (nick ci) ++ " host: " ++ unpack (host ci) instance Eq ClientInfo where (==) = (==) `on` clientSocket @@ -66,9 +63,9 @@ } instance Show TeamInfo where - show ti = "owner: " ++ (unpack $ teamowner ti) - ++ "name: " ++ (unpack $ teamname ti) - ++ "color: " ++ (unpack $ teamcolor ti) + show ti = "owner: " ++ unpack (teamowner ti) + ++ "name: " ++ unpack (teamname ti) + ++ "color: " ++ unpack (teamcolor ti) data RoomInfo = RoomInfo @@ -95,7 +92,7 @@ ++ ", teams: " ++ show (teams ri) newRoom :: RoomInfo -newRoom = ( +newRoom = RoomInfo undefined "" @@ -111,7 +108,6 @@ [] [] (Map.singleton "MAP" ["+rnd+"]) - ) data StatisticsInfo = StatisticsInfo @@ -142,7 +138,7 @@ show _ = "Server Info" newServerInfo :: TMVar StatisticsInfo -> Chan CoreMessage -> Chan DBQuery -> ServerInfo -newServerInfo = ( +newServerInfo = ServerInfo True "

http://www.hedgewars.org/

" @@ -154,7 +150,6 @@ "" "" [] - ) data AccountInfo = HasAccount B.ByteString Bool