From d8a854d6e04cecee59fab0ad40c22733d7f67020 Mon Sep 17 00:00:00 2001
From: linencloth <none@none>
Date: Fri, 17 Sep 2010 07:04:29 +0200
Subject: Core: Cleanup locale handling. It also fixes the recent problem of
 strange strings.

--HG--
branch : trunk
---
 src/server/game/Entities/GameObject/GameObject.cpp | 4 ++--
 src/server/game/Entities/GameObject/GameObject.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server/game/Entities/GameObject')

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 459b7ccd289..4b65fc7aabf 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1710,9 +1710,9 @@ void GameObject::EventInform(uint32 eventId)
 }
 
 // overwrite WorldObject function for proper name localization
-const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
+const char* GameObject::GetNameForLocaleIdx(LocaleConstant loc_idx) const
 {
-    if (loc_idx >= 0)
+    if (loc_idx != DEFAULT_LOCALE)
     {
         uint8 uloc_idx = uint8(loc_idx);
         if (GameObjectLocale const *cl = sObjectMgr.GetGameObjectLocale(GetEntry()))
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 4dd93e24519..6ae7aebd2f0 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -622,7 +622,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
         void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); }
 
         // overwrite WorldObject function for proper name localization
-        const char* GetNameForLocaleIdx(int32 locale_idx) const;
+        const char* GetNameForLocaleIdx(LocaleConstant locale_idx) const;
 
         void SaveToDB();
         void SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask);
-- 
cgit v1.2.3