diff -r 4ac87acbaed9 -r 82d062e36e96 gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Tue Jan 21 22:53:15 2014 +0100 +++ b/gameServer/CoreTypes.hs Tue Jan 21 23:15:25 2014 +0100 @@ -183,6 +183,7 @@ isRegisteredOnly :: Bool, isSpecial :: Bool, greeting :: B.ByteString, + voting :: Maybe Voting, roomBansList :: ![B.ByteString], mapParams :: Map.Map B.ByteString B.ByteString, params :: Map.Map B.ByteString [B.ByteString] @@ -204,6 +205,7 @@ False False "" + Nothing [] ( Map.fromList $ Prelude.zip @@ -212,8 +214,8 @@ ) ( Map.fromList $ Prelude.zip - ["SCHEME", "SCRIPT", "Theme"] - [["Default"], ["Normal"], ["Theme"]] + ["SCHEME", "SCRIPT", "THEME", "MAZE_SIZE", "DRAWNMAP"] + [["Default"], ["Normal"], ["Theme"], ["0"], ["-"]] ) @@ -264,6 +266,21 @@ False [] +data Voting = Voting { + voteTTL :: Int, + entitledToVote :: [Unique], + votes :: [(Unique, Bool)], + voteType :: VoteType + } + + +data VoteType = VoteKick B.ByteString + + +newVote :: VoteType -> Voting +newVote = Voting 2 [] [] + + data AccountInfo = HasAccount B.ByteString Bool Bool | Guest