sheepy-clone: comparison gameServer/HWProtoInRoomState.hs

equal deleted inserted replaced

-:da43c36a6e92
+:f11d80bac7ed
 ModifyRoom (\r -> r{params = Map.insert paramName paramStrs (params r)}),
 AnswerClients chans ("CFG" : paramName : paramStrs)]
 else
 return [ProtocolError "Not room master"]
-handleCmd_inRoom ("ADD_TEAM" : name : color : grave : fort : voicepack : flag : difStr : hhsInfo)
+handleCmd_inRoom ("ADD_TEAM" : tName : color : grave : fort : voicepack : flag : difStr : hhsInfo)
 | length hhsInfo /= 16 = return [ProtocolError "Corrupted hedgehogs info"]
 | otherwise = do
-(ci, rnc) <- ask
+(ci, _) <- ask
-r <- thisRoom
+rm <- thisRoom
 clNick <- clientNick
 clChan <- thisClientChans
-othersChans <- roomOthersChans
+othChans <- roomOthersChans
 return $
-if not . null . drop 5 $ teams r then
+if not . null . drop 5 $ teams rm then
 [Warning "too many teams"]
-else if canAddNumber r <= 0 then
+else if canAddNumber rm <= 0 then
 [Warning "too many hedgehogs"]
-else if isJust $ findTeam r then
+else if isJust $ findTeam rm then
 [Warning "There's already a team with same name in the list"]
-else if gameinprogress r then
+else if gameinprogress rm then
 [Warning "round in progress"]
-else if isRestrictedTeams r then
+else if isRestrictedTeams rm then
 [Warning "restricted"]
 else
 [ModifyRoom (\r -> r{teams = teams r ++ [newTeam ci clNick r]}),
 ModifyClient (\c -> c{teamsInGame = teamsInGame c + 1, clientClan = color}),
-AnswerClients clChan ["TEAM_ACCEPTED", name],
+AnswerClients clChan ["TEAM_ACCEPTED", tName],
-AnswerClients othersChans $ teamToNet $ newTeam ci clNick r,
+AnswerClients othChans $ teamToNet $ newTeam ci clNick rm,
-AnswerClients othersChans ["TEAM_COLOR", name, color]
+AnswerClients othChans ["TEAM_COLOR", tName, color]
 ]
 where
 canAddNumber r = 48 - (sum . map hhnum $ teams r)
-findTeam = find (\t -> name == teamname t) . teams
+findTeam = find (\t -> tName == teamname t) . teams
-newTeam ci clNick r = (TeamInfo ci clNick name color grave fort voicepack flag difficulty (newTeamHHNum r) (hhsList hhsInfo))
+newTeam ci clNick r = TeamInfo ci clNick tName color grave fort voicepack flag dif (newTeamHHNum r) (hhsList hhsInfo)
-difficulty = case B.readInt difStr of
+dif = case B.readInt difStr of
 Just (i, t) | B.null t -> fromIntegral i
-otherwise -> 0
+_ -> 0
 hhsList [] = []
 hhsList [_] = error "Hedgehogs list with odd elements number"
 hhsList (n:h:hhs) = HedgehogInfo n h : hhsList hhs
 newTeamHHNum r = min 4 (canAddNumber r)
-handleCmd_inRoom ["REMOVE_TEAM", name] = do
+handleCmd_inRoom ["REMOVE_TEAM", tName] = do
-(ci, rnc) <- ask
+(ci, _) <- ask
 r <- thisRoom
 clNick <- clientNick
 let maybeTeam = findTeam r
 let team = fromJust maybeTeam
 if isNothing $ findTeam r then
 [Warning "REMOVE_TEAM: no such team"]
 else if clNick /= teamowner team then
 [ProtocolError "Not team owner!"]
 else
-[RemoveTeam name,
+[RemoveTeam tName,
 ModifyClient
 (\c -> c{
 teamsInGame = teamsInGame c - 1,
 clientClan = if teamsInGame c == 1 then undefined else anotherTeamClan ci r
 })
 ]
 where
 anotherTeamClan ci = teamcolor . fromJust . find (\t -> teamownerId t == ci) . teams
-findTeam = find (\t -> name == teamname t) . teams
+findTeam = find (\t -> tName == teamname t) . teams
 handleCmd_inRoom ["HH_NUM", teamName, numberStr] = do
 cl <- thisClient
 others <- roomOthersChans
 let team = fromJust maybeTeam
 return $
 if not $ isMaster cl then
 [ProtocolError "Not room master"]
-else if hhNumber < 1 || hhNumber > 8 || isNothing maybeTeam || hhNumber > (canAddNumber r) + (hhnum team) then
+else if hhNumber < 1 || hhNumber > 8 || isNothing maybeTeam || hhNumber > canAddNumber r + hhnum team then
 []
 else
 [ModifyRoom $ modifyTeam team{hhnum = hhNumber},
 AnswerClients others ["HH_NUM", teamName, B.pack $ show hhNumber]]
 where
 hhNumber = case B.readInt numberStr of
 Just (i, t) | B.null t -> fromIntegral i
-otherwise -> 0
+_ -> 0
 findTeam = find (\t -> teamName == teamname t) . teams
 canAddNumber = (-) 48 . sum . map hhnum . teams
 AnswerClients chans ["CLIENT_FLAGS", if isReady cl then "-r" else "+r", nick cl]
 ]
 handleCmd_inRoom ["START_GAME"] = do
 cl <- thisClient
-r <- thisRoom
+rm <- thisRoom
 chans <- roomClientsChans
-if isMaster cl && (playersIn r == readyPlayers r) && (not $ gameinprogress r) then
+if isMaster cl && playersIn rm == readyPlayers rm && not (gameinprogress rm) then
-if enoughClans r then
+if enoughClans rm then
 return [
 ModifyRoom
 (\r -> r{
 gameinprogress = True,
 roundMsgs = empty,
 enoughClans = not . null . drop 1 . group . map teamcolor . teams
 handleCmd_inRoom ["EM", msg] = do
 cl <- thisClient
-r <- thisRoom
+rm <- thisRoom
 chans <- roomOthersChans
-if (teamsInGame cl > 0) && (gameinprogress r) && isLegal then
+if teamsInGame cl > 0 && gameinprogress rm && isLegal then
-return $ (AnswerClients chans ["EM", msg]) : [ModifyRoom (\r -> r{roundMsgs = roundMsgs r |> msg}) | not isKeepAlive]
+return $ AnswerClients chans ["EM", msg] : [ModifyRoom (\r -> r{roundMsgs = roundMsgs r |> msg}) | not isKeepAlive]
 else
 return []
 where
 (isLegal, isKeepAlive) = checkNetCmd msg
 handleCmd_inRoom ["ROUNDFINISHED", _] = do
 cl <- thisClient
-r <- thisRoom
+rm <- thisRoom
 chans <- roomClientsChans
-if isMaster cl && (gameinprogress r) then
+if isMaster cl && gameinprogress rm then
-return $ (ModifyRoom
+return $ ModifyRoom
 (\r -> r{
 gameinprogress = False,
 readyPlayers = 0,
 roundMsgs = empty,
 leftTeams = [],
 teamsAtStart = []}
-))
+)
 : UnreadyRoomClients
-: answerRemovedTeams chans r
+: answerRemovedTeams chans rm
 else
 return []
 where
 answerRemovedTeams chans = map (\t -> AnswerClients chans ["REMOVE_TEAM", t]) . leftTeams
 handleCmd_inRoom ["KICK", kickNick] = do
 (thisClientId, rnc) <- ask
 maybeClientId <- clientByNick kickNick
 master <- liftM isMaster thisClient
 let kickId = fromJust maybeClientId
-let sameRoom = (clientRoom rnc thisClientId) == (clientRoom rnc kickId)
+let sameRoom = clientRoom rnc thisClientId == clientRoom rnc kickId
 return
 [KickRoomClient kickId | master && isJust maybeClientId && (kickId /= thisClientId) && sameRoom]
 handleCmd_inRoom ["TEAMCHAT", msg] = do
 cl <- thisClient
 chans <- roomSameClanChans
 return [AnswerClients chans ["EM", engineMsg cl]]
 where
-engineMsg cl = toEngineMsg $ "b" `B.append` (nick cl) `B.append` "(team): " `B.append` msg `B.append` "\x20\x20"
+engineMsg cl = toEngineMsg $ "b" `B.append` nick cl `B.append` "(team): " `B.append` msg `B.append` "\x20\x20"
 handleCmd_inRoom _ = return [ProtocolError "Incorrect command (state: in room)"]

changeset 4932	f11d80bac7ed
parent 4931	da43c36a6e92
child 4941	90572c338e60