diff -r 0a5e651d494c -r 58cf89284115 gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Tue Jan 21 21:16:52 2014 +0100 +++ b/gameServer/CoreTypes.hs Wed Jan 22 01:11:13 2014 +0400 @@ -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 @@ -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