--- a/gameServer/CoreTypes.hs Wed Dec 04 12:28:04 2013 +0100
+++ b/gameServer/CoreTypes.hs Thu Dec 05 00:51:27 2013 +0400
@@ -170,7 +170,7 @@
data RoomInfo =
RoomInfo
{
- masterID :: ClientIndex,
+ masterID :: Maybe ClientIndex,
name :: B.ByteString,
password :: B.ByteString,
roomProto :: Word16,
@@ -181,6 +181,7 @@
isRestrictedJoins :: Bool,
isRestrictedTeams :: Bool,
isRegisteredOnly :: Bool,
+ isSpecial :: Bool,
roomBansList :: ![B.ByteString],
mapParams :: Map.Map B.ByteString B.ByteString,
params :: Map.Map B.ByteString [B.ByteString]
@@ -189,7 +190,7 @@
newRoom :: RoomInfo
newRoom =
RoomInfo
- (error "No room master defined")
+ Nothing
""
""
0
@@ -200,13 +201,19 @@
False
False
False
+ False
[]
(
- Map.fromList $ Prelude.zipWith (,)
+ Map.fromList $ Prelude.zip
["MAP", "MAPGEN", "MAZE_SIZE", "SEED", "TEMPLATE"]
["+rnd+", "0", "0", "seed", "0"]
)
- (Map.singleton "SCHEME" ["Default"])
+ (
+ Map.fromList $ Prelude.zip
+ ["SCHEME", "SCRIPT"]
+ [["Default"], ["Normal"]]
+ )
+
data StatisticsInfo =
StatisticsInfo