diff -r 450ca0afcd58 -r 9be6693c78cb gameServer/HWProtoCore.hs --- a/gameServer/HWProtoCore.hs Thu Feb 25 15:58:44 2010 +0000 +++ b/gameServer/HWProtoCore.hs Thu Feb 25 18:28:33 2010 +0000 @@ -16,71 +16,71 @@ handleCmd clID _ _ ["PING"] = [AnswerThisClient ["PONG"]] handleCmd clID clients rooms ("QUIT" : xs) = - [ByeClient msg] - where - msg = if not $ null xs then head xs else "" + [ByeClient msg] + where + msg = if not $ null xs then head xs else "" handleCmd clID clients _ ["PONG"] = - if pingsQueue client == 0 then - [ProtocolError "Protocol violation"] - else - [ModifyClient (\cl -> cl{pingsQueue = pingsQueue cl - 1})] - where - client = clients IntMap.! clID + if pingsQueue client == 0 then + [ProtocolError "Protocol violation"] + else + [ModifyClient (\cl -> cl{pingsQueue = pingsQueue cl - 1})] + where + client = clients IntMap.! clID handleCmd clID clients rooms cmd = - if not $ logonPassed client then - handleCmd_NotEntered clID clients rooms cmd - else - handleCmd_loggedin clID clients rooms cmd - where - client = clients IntMap.! clID + if not $ logonPassed client then + handleCmd_NotEntered clID clients rooms cmd + else + handleCmd_loggedin clID clients rooms cmd + where + client = clients IntMap.! clID handleCmd_loggedin clID clients rooms ["INFO", asknick] = - if noSuchClient then - [] - else - [AnswerThisClient - ["INFO", - nick client, - "[" ++ host client ++ "]", - protoNumber2ver $ clientProto client, - "[" ++ roomInfo ++ "]" ++ roomStatus]] - where - maybeClient = find (\cl -> asknick == nick cl) clients - noSuchClient = isNothing maybeClient - client = fromJust maybeClient - room = rooms IntMap.! roomID client - roomInfo = if roomID client /= 0 then roomMasterSign ++ "room " ++ (name room) else adminSign ++ "lobby" - roomMasterSign = if isMaster client then "@" else "" - adminSign = if isAdministrator client then "@" else "" - roomStatus = - if gameinprogress room - then if teamsInGame client > 0 then "(playing)" else "(spectating)" - else "" + if noSuchClient then + [] + else + [AnswerThisClient + ["INFO", + nick client, + "[" ++ host client ++ "]", + protoNumber2ver $ clientProto client, + "[" ++ roomInfo ++ "]" ++ roomStatus]] + where + maybeClient = find (\cl -> asknick == nick cl) clients + noSuchClient = isNothing maybeClient + client = fromJust maybeClient + room = rooms IntMap.! roomID client + roomInfo = if roomID client /= 0 then roomMasterSign ++ "room " ++ (name room) else adminSign ++ "lobby" + roomMasterSign = if isMaster client then "@" else "" + adminSign = if isAdministrator client then "@" else "" + roomStatus = + if gameinprogress room + then if teamsInGame client > 0 then "(playing)" else "(spectating)" + else "" handleCmd_loggedin clID clients rooms ["FOLLOW", asknick] = - if inLobby || noSuchClient then - [] - else - handleCmd_lobby clID clients rooms ["JOIN_ROOM", roomname] - where - maybeClient = find (\cl -> asknick == nick cl) clients - noSuchClient = isNothing maybeClient - client = fromJust maybeClient - room = rooms IntMap.! roomID client - roomname = (name room) - inLobby = roomname == "" + if inLobby || noSuchClient then + [] + else + handleCmd_lobby clID clients rooms ["JOIN_ROOM", roomname] + where + maybeClient = find (\cl -> asknick == nick cl) clients + noSuchClient = isNothing maybeClient + client = fromJust maybeClient + room = rooms IntMap.! roomID client + roomname = (name room) + inLobby = roomname == "" handleCmd_loggedin clID clients rooms cmd = - if roomID client == 0 then - handleCmd_lobby clID clients rooms cmd - else - handleCmd_inRoom clID clients rooms cmd - where - client = clients IntMap.! clID + if roomID client == 0 then + handleCmd_lobby clID clients rooms cmd + else + handleCmd_inRoom clID clients rooms cmd + where + client = clients IntMap.! clID