From 211d56d6337788b1268c5d89d41e20955d17272c Mon Sep 17 00:00:00 2001 From: joschiwald Date: Sat, 26 Apr 2014 03:40:30 +0200 Subject: Core/BG/SA: * replaced some trinity_string with broadcasttexts * basic implementation of phasing in SA * spawn some triggers in SA (fixes dest position of teleport pads) * added text getter to broadcasttext struct * some cleanup in destructable go event notification --- src/server/game/AI/SmartScripts/SmartScript.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/server/game/AI/SmartScripts') diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 92007a16569..a0e516ca819 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -42,18 +42,13 @@ class BroadcastTextBuilder { public: BroadcastTextBuilder(WorldObject const* obj, ChatMsg msgtype, uint32 id, WorldObject const* target, uint32 gender = GENDER_MALE) - : _source(obj), _msgType(msgtype), _textId(id), _target(target), _gender(gender) - { - } + : _source(obj), _msgType(msgtype), _textId(id), _target(target), _gender(gender) { } size_t operator()(WorldPacket* data, LocaleConstant locale) const { BroadcastText const* bct = sObjectMgr->GetBroadcastText(_textId); - std::string text = ""; - if (bct) - ObjectMgr::GetLocaleString(_gender == GENDER_MALE ? bct->MaleText : bct->FemaleText, locale, text); - return ChatHandler::BuildChatPacket(*data, _msgType, bct ? Language(bct->Language) : LANG_UNIVERSAL, _source, _target, text, 0, "", locale); + return ChatHandler::BuildChatPacket(*data, _msgType, bct ? Language(bct->Language) : LANG_UNIVERSAL, _source, _target, bct ? bct->GetText(locale, _gender) : "", 0, "", locale); } WorldObject const* _source; -- cgit v1.2.3