diff -r 99a921e292f4 -r aa7aefec5c1b netserver/HWProto.hs --- a/netserver/HWProto.hs Mon Oct 13 18:37:59 2008 +0000 +++ b/netserver/HWProto.hs Mon Oct 13 19:04:27 2008 +0000 @@ -58,14 +58,11 @@ else if isMaster client then (noChangeClients, removeRoom (room client), answerQuit ++ answerAbandoned) -- core disconnects clients on ROOMABANDONED answer else - (noChangeClients, modifyRoom clRoom{teams = othersTeams}, answerQuit ++ (answerQuitInform $ nick client) ++ answerRemoveClientTeams ++ answerLostTeams) + (noChangeClients, modifyRoom clRoom{teams = othersTeams}, answerQuit ++ (answerQuitInform $ nick client) ++ answerRemoveClientTeams) where clRoom = roomByName (room client) rooms answerRemoveClientTeams = map (\tn -> (othersInRoom, ["REMOVE_TEAM", teamname tn])) clientTeams (clientTeams, othersTeams) = partition (\t -> teamowner t == nick client) $ teams clRoom - answerLostTeams = if gameinprogress clRoom then answerInGameLostTeams clientTeams else [] - answerInGameLostTeams teams = [] - -- check state and call state-dependent commmand handlers