diff -r 47084c6fcb4e -r 3bb505fc707e gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Tue Feb 26 20:26:49 2013 -0500 +++ b/gameServer/HWProtoInRoomState.hs Tue Feb 26 20:37:58 2013 -0500 @@ -77,11 +77,11 @@ SendUpdateOnThisRoom, ModifyClient (\c -> c{teamsInGame = teamsInGame c + 1, clientClan = Just teamColor}), AnswerClients clChan ["TEAM_ACCEPTED", tName], + AnswerClients othChans $ teamToNet $ newTeam, + AnswerClients roomChans ["TEAM_COLOR", tName, teamColor], ModifyClient $ \c -> c{actionsPending = actionsPending cl - ++ [AnswerClients clChan ["HH_NUM", tName, showB $ hhnum newTeam] - , AnswerClients othChans $ teamToNet $ newTeam - , AnswerClients roomChans ["TEAM_COLOR", tName, teamColor] - ]}, + ++ [AnswerClients clChan ["HH_NUM", tName, showB $ hhnum newTeam]] + }, AnswerClients [sendChan cl] ["PING"] ] where @@ -229,7 +229,7 @@ (legalMsgs, nonEmptyMsgs) = checkNetCmd msg -handleCmd_inRoom ["ROUNDFINISHED", correctly] = do +handleCmd_inRoom ["ROUNDFINISHED", _] = do cl <- thisClient rm <- thisRoom chans <- roomClientsChans @@ -245,7 +245,7 @@ else return [] -- don't accept this message twice where - isCorrect = correctly == "1" +-- isCorrect = correctly == "1" -- compatibility with clients with protocol < 38 handleCmd_inRoom ["ROUNDFINISHED"] =