gameServer/Actions.hs
changeset 1846 24d0074d4eed
parent 1841 fba7210b438b
child 1847 2178c0fc838c
equal deleted inserted replaced
1845:1d4a5280887d 1846:24d0074d4eed
   117 				else
   117 				else
   118 					[AnswerThisRoom ["LEFT", clientNick]]
   118 					[AnswerThisRoom ["LEFT", clientNick]]
   119 			else
   119 			else
   120 				[]
   120 				[]
   121 		answerOthersQuit =
   121 		answerOthersQuit =
   122 			if not $ Prelude.null clientNick then
   122 			if logonPassed client then
   123 				if not $ Prelude.null msg then
   123 				if not $ Prelude.null msg then
   124 					[AnswerAll ["LOBBY:LEFT", clientNick, msg]]
   124 					[AnswerAll ["LOBBY:LEFT", clientNick, msg]]
   125 				else
   125 				else
   126 					[AnswerAll ["LOBBY:LEFT", clientNick]]
   126 					[AnswerAll ["LOBBY:LEFT", clientNick]]
   127 			else
   127 			else
   272 	foldM processAction (clID, serverInfo, clients, rooms) $
   272 	foldM processAction (clID, serverInfo, clients, rooms) $
   273 		(RoomAddThisClient 0)
   273 		(RoomAddThisClient 0)
   274 		: answerLobbyNicks
   274 		: answerLobbyNicks
   275 		-- ++ (answerServerMessage client clients)
   275 		-- ++ (answerServerMessage client clients)
   276 	where
   276 	where
   277 		lobbyNicks = Prelude.filter (\n -> (not (Prelude.null n))) $ Prelude.map nick $ elems clients
   277 		lobbyNicks = Prelude.map nick $ Prelude.filter logonPassed $ elems clients
   278 		answerLobbyNicks = if not $ Prelude.null lobbyNicks then
   278 		answerLobbyNicks = if not $ Prelude.null lobbyNicks then
   279 					[AnswerThisClient (["LOBBY:JOINED"] ++ lobbyNicks)]
   279 					[AnswerThisClient (["LOBBY:JOINED"] ++ lobbyNicks)]
   280 				else
   280 				else
   281 					[]
   281 					[]
   282 
   282