equal
deleted
inserted
replaced
68 ++ "color: " ++ (unpack $ teamcolor ti) |
68 ++ "color: " ++ (unpack $ teamcolor ti) |
69 |
69 |
70 data RoomInfo = |
70 data RoomInfo = |
71 RoomInfo |
71 RoomInfo |
72 { |
72 { |
73 masterID :: !Int, |
73 masterID :: ClientIndex, |
74 name :: B.ByteString, |
74 name :: B.ByteString, |
75 password :: B.ByteString, |
75 password :: B.ByteString, |
76 roomProto :: Word16, |
76 roomProto :: Word16, |
77 teams :: [TeamInfo], |
77 teams :: [TeamInfo], |
78 gameinprogress :: Bool, |
78 gameinprogress :: Bool, |
94 ++ ", teams: " ++ show (teams ri) |
94 ++ ", teams: " ++ show (teams ri) |
95 |
95 |
96 newRoom :: RoomInfo |
96 newRoom :: RoomInfo |
97 newRoom = ( |
97 newRoom = ( |
98 RoomInfo |
98 RoomInfo |
99 0 |
99 undefined |
100 "" |
100 "" |
101 "" |
101 "" |
102 0 |
102 0 |
103 [] |
103 [] |
104 False |
104 False |
122 |
122 |
123 data ServerInfo = |
123 data ServerInfo = |
124 ServerInfo |
124 ServerInfo |
125 { |
125 { |
126 isDedicated :: Bool, |
126 isDedicated :: Bool, |
127 serverMessage :: String, |
127 serverMessage :: B.ByteString, |
128 serverMessageForOldVersions :: B.ByteString, |
128 serverMessageForOldVersions :: B.ByteString, |
129 latestReleaseVersion :: Word16, |
129 latestReleaseVersion :: Word16, |
130 listenPort :: PortNumber, |
130 listenPort :: PortNumber, |
131 nextRoomID :: Int, |
131 nextRoomID :: Int, |
132 dbHost :: B.ByteString, |
132 dbHost :: B.ByteString, |