equal
deleted
inserted
replaced
8 import qualified Data.IntMap as IntMap |
8 import qualified Data.IntMap as IntMap |
9 import qualified Data.IntSet as IntSet |
9 import qualified Data.IntSet as IntSet |
10 import Data.Sequence(Seq, empty) |
10 import Data.Sequence(Seq, empty) |
11 import Data.Time |
11 import Data.Time |
12 import Network |
12 import Network |
|
13 import Data.Function |
13 |
14 |
14 |
15 |
15 data ClientInfo = |
16 data ClientInfo = |
16 ClientInfo |
17 ClientInfo |
17 { |
18 { |
31 isAdministrator :: Bool, |
32 isAdministrator :: Bool, |
32 teamsInGame :: Word |
33 teamsInGame :: Word |
33 } |
34 } |
34 |
35 |
35 instance Show ClientInfo where |
36 instance Show ClientInfo where |
36 show ci = (show $ clientUID ci) |
37 show ci = show (clientUID ci) |
37 ++ " nick: " ++ (nick ci) |
38 ++ " nick: " ++ (nick ci) |
38 ++ " host: " ++ (host ci) |
39 ++ " host: " ++ (host ci) |
39 |
40 |
40 instance Eq ClientInfo where |
41 instance Eq ClientInfo where |
41 a1 == a2 = clientHandle a1 == clientHandle a2 |
42 (==) = (==) `on` clientHandle |
42 |
43 |
43 data HedgehogInfo = |
44 data HedgehogInfo = |
44 HedgehogInfo String String |
45 HedgehogInfo String String |
45 |
46 |
46 data TeamInfo = |
47 data TeamInfo = |
76 teamsAtStart :: [TeamInfo], |
77 teamsAtStart :: [TeamInfo], |
77 params :: Map.Map String [String] |
78 params :: Map.Map String [String] |
78 } |
79 } |
79 |
80 |
80 instance Show RoomInfo where |
81 instance Show RoomInfo where |
81 show ri = (show $ roomUID ri) |
82 show ri = show (roomUID ri) |
82 ++ ", players ids: " ++ (show $ IntSet.size $ playersIDs ri) |
83 ++ ", players ids: " ++ show (IntSet.size $ playersIDs ri) |
83 ++ ", players: " ++ (show $ playersIn ri) |
84 ++ ", players: " ++ show (playersIn ri) |
84 ++ ", ready: " ++ (show $ readyPlayers ri) |
85 ++ ", ready: " ++ show (readyPlayers ri) |
85 |
86 |
86 instance Eq RoomInfo where |
87 instance Eq RoomInfo where |
87 a1 == a2 = roomUID a1 == roomUID a2 |
88 (==) = (==) `on` roomUID |
88 |
89 |
89 newRoom = ( |
90 newRoom = ( |
90 RoomInfo |
91 RoomInfo |
91 0 |
92 0 |
92 "" |
93 "" |