diff options
| author | linencloth <none@none> | 2010-09-17 07:04:29 +0200 |
|---|---|---|
| committer | linencloth <none@none> | 2010-09-17 07:04:29 +0200 |
| commit | d8a854d6e04cecee59fab0ad40c22733d7f67020 (patch) | |
| tree | 8e2e977c32e85acea3dad72d65e47ed760f87fee /src/server/game/Entities/Object | |
| parent | 5de48a67c6b650e98271acc704de8c4ed432bf4f (diff) | |
Core: Cleanup locale handling.
It also fixes the recent problem of strange strings.
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index d0de42351b0..fc9032bc448 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1634,7 +1634,7 @@ namespace Trinity public: MonsterChatBuilder(WorldObject const& obj, ChatMsg msgtype, int32 textId, uint32 language, uint64 targetGUID) : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_targetGUID(targetGUID) {} - void operator()(WorldPacket& data, int32 loc_idx) + void operator()(WorldPacket& data, LocaleConstant loc_idx) { char const* text = sObjectMgr.GetTrinityString(i_textId,loc_idx); @@ -1715,7 +1715,7 @@ void WorldObject::MonsterWhisper(int32 textId, uint64 receiver, bool IsBossWhisp if (!player || !player->GetSession()) return; - uint32 loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); + LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); char const* text = sObjectMgr.GetTrinityString(textId, loc_idx); WorldPacket data(SMSG_MESSAGECHAT, 200); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index efa953d378c..c6f54e47a60 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -612,7 +612,7 @@ class WorldObject : public Object, public WorldLocation const char* GetName() const { return m_name.c_str(); } void SetName(const std::string& newname) { m_name=newname; } - virtual const char* GetNameForLocaleIdx(int32 /*locale_idx*/) const { return GetName(); } + virtual const char* GetNameForLocaleIdx(LocaleConstant /*locale_idx*/) const { return GetName(); } float GetDistance(const WorldObject *obj) const { |