--- a/gameServer/HWProtoLobbyState.hs Sun Sep 22 18:34:53 2013 +0300
+++ b/gameServer/HWProtoLobbyState.hs Wed Sep 25 05:42:16 2013 +0300
@@ -14,16 +14,6 @@
import EngineInteraction
-answerAllTeams :: ClientInfo -> [TeamInfo] -> [Action]
-answerAllTeams cl = concatMap toAnswer
- where
- clChan = sendChan cl
- toAnswer team =
- [AnswerClients [clChan] $ teamToNet team,
- AnswerClients [clChan] ["TEAM_COLOR", teamname team, teamcolor team],
- AnswerClients [clChan] ["HH_NUM", teamname team, showB $ hhnum team]]
-
-
handleCmd_lobby :: CmdHandler
@@ -118,10 +108,7 @@
AnswerClients [sendChan cl] ["RUN_GAME"]
: AnswerClients chans ["CLIENT_FLAGS", "+g", nick cl]
: ModifyClient (\c -> c{isInGame = True})
- : (AnswerClients [sendChan cl] $ "EM" : toEngineMsg "e$spectate 1" : (reverse . roundMsgs . fromJust . gameInfo $ jRoom))
- : [AnswerClients [sendChan cl] $ "EM" : [fromJust msg] | isJust msg]
- where
- msg = lastFilteredTimedMsg . fromJust . gameInfo $ jRoom
+ : [AnswerClients [sendChan cl] $ "EM" : toEngineMsg "e$spectate 1" : (reverse . roundMsgs . fromJust . gameInfo $ jRoom)]
handleCmd_lobby ["JOIN_ROOM", roomName] =