# HG changeset patch # User Wuzzy # Date 1535227341 -7200 # Node ID dc06ef77a73a5b052e13f1ca5df30bec4352beaf # Parent bb68f721e666d54e603fac271b72198129e2fb74 Don't translate greeting message diff -r bb68f721e666 -r dc06ef77a73a gameServer/Consts.hs --- a/gameServer/Consts.hs Sat Aug 25 21:36:15 2018 +0200 +++ b/gameServer/Consts.hs Sat Aug 25 22:02:21 2018 +0200 @@ -53,3 +53,7 @@ -- For /global command nickGlobal :: B.ByteString nickGlobal = "(global notice)" + +-- For greeting message added with /greeting command +nickGreeting :: B.ByteString +nickGreeting = "(greeting)" diff -r bb68f721e666 -r dc06ef77a73a gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Sat Aug 25 21:36:15 2018 +0200 +++ b/gameServer/HWProtoLobbyState.hs Sat Aug 25 22:02:21 2018 +0200 @@ -26,6 +26,7 @@ -------------------------------------- import CoreTypes import Utils +import Consts import HandlerUtils import RoomsAndClients import EngineInteraction @@ -117,7 +118,7 @@ ++ answerFullConfig cl jRoom ++ answerTeams cl jRoom ++ watchRound cl jRoom chans - ++ [AnswerClients [sendChan cl] ["CHAT", "[greeting]", greeting jRoom] | greeting jRoom /= ""] + ++ [AnswerClients [sendChan cl] ["CHAT", nickGreeting, greeting jRoom] | greeting jRoom /= ""] ++ map (\t -> AnswerClients chans ["EM", toEngineMsg $ 'G' `B.cons` t]) clTeamsNames ++ [AnswerClients [sendChan cl] ["EM", toEngineMsg "I"] | isPaused `fmap` gameInfo jRoom == Just True]