diff -r d04601edf73d -r 08ed346ed341 gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Thu Dec 29 09:40:16 2011 +0100 +++ b/gameServer/HWProtoLobbyState.hs Thu Dec 29 23:02:40 2011 +0300 @@ -24,6 +24,7 @@ AnswerClients [clChan] ["TEAM_COLOR", teamname team, teamcolor team], AnswerClients [clChan] ["HH_NUM", teamname team, showB $ hhnum team]] + handleCmd_lobby :: CmdHandler @@ -31,19 +32,8 @@ (ci, irnc) <- ask let cl = irnc `client` ci rooms <- allRoomInfos - let roomsInfoList = concatMap (roomInfo irnc) . filter (\r -> (roomProto r == clientProto cl) && not (isRestrictedJoins r)) + let roomsInfoList = concatMap (\r -> roomInfo (nick $ irnc `client` masterID r) r) . filter (\r -> (roomProto r == clientProto cl)) return [AnswerClients [sendChan cl] ("ROOMS" : roomsInfoList rooms)] - where - roomInfo irnc r = [ - showB $ isJust $ gameInfo r, - name r, - showB $ playersIn r, - showB $ length $ teams r, - nick $ irnc `client` masterID r, - Map.findWithDefault "+rnd+" "MAP" (mapParams r), - head (Map.findWithDefault ["Default"] "SCHEME" (params r)), - head (Map.findWithDefault ["Default"] "AMMO" (params r)) - ] handleCmd_lobby ["CHAT", msg] = do