# HG changeset patch # User unc0rr # Date 1236530842 0 # Node ID ce5854fbc6316cb3e074e6ff7588b22cfbab4136 # Parent 72af1c41434508b3f2a4d7b81050a9b3aa063036 Send MAP config param last diff -r 72af1c414345 -r ce5854fbc631 gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Sun Mar 08 16:01:06 2009 +0000 +++ b/gameServer/HWProtoLobbyState.hs Sun Mar 08 16:47:22 2009 +0000 @@ -71,7 +71,7 @@ ++ answerNicks ++ answerReady ++ [AnswerThisRoom ["NOT_READY", nick client]] - ++ answerFullConfig jRoom + ++ answerFullConfig ++ answerTeams ++ watchRound where @@ -90,7 +90,9 @@ map (\clID -> clients IntMap.! clID) roomClientsIDs toAnswer (paramName, paramStrs) = AnswerThisClient $ "CFG" : paramName : paramStrs - answerFullConfig room = map toAnswer (Map.toList $ params room) + + answerFullConfig = map toAnswer (leftConfigPart ++ rightConfigPart) + (leftConfigPart, rightConfigPart) = partition (\(p, _) -> p /= "MAP") (Map.toList $ params jRoom) watchRound = if not $ gameinprogress jRoom then []