diff -r ce6ead3327b2 -r c73fd8cfa7c0 gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Mon Aug 27 17:40:16 2012 +0200 +++ b/gameServer/HWProtoLobbyState.hs Sun Sep 16 16:54:51 2012 +0200 @@ -6,6 +6,7 @@ import Data.Maybe import Data.List import Control.Monad.Reader +import qualified Data.ByteString.Char8 as B -------------------------------------- import CoreTypes import Actions @@ -69,6 +70,7 @@ let sameProto = clientProto cl == roomProto jRoom let jRoomClients = map (client irnc) $ roomClients irnc jRI let nicks = map nick jRoomClients + let ownerNick = nick . fromJust $ find isMaster jRoomClients let chans = map sendChan (cl : jRoomClients) let isBanned = host cl `elem` roomBansList jRoom return $ @@ -82,9 +84,11 @@ [NoticeMessage WrongPassword] else [ - MoveToRoom jRI, - AnswerClients [sendChan cl] $ "JOINED" : nicks, - AnswerClients chans ["CLIENT_FLAGS", "-r", nick cl] + MoveToRoom jRI + , AnswerClients [sendChan cl] $ "JOINED" : nicks + , AnswerClients chans ["CLIENT_FLAGS", "-r", nick cl] + , AnswerClients [sendChan cl] $ ["WARNING", "Room admin is " `B.append` ownerNick] + , AnswerClients [sendChan cl] $ ["CLIENT_FLAGS", "+h", ownerNick] ] ++ map (readynessMessage cl) jRoomClients ++ answerFullConfig cl (mapParams jRoom) (params jRoom)