Core/Cleanup: move repeating code for locale strings retrieval into separate method. Related code cleanup.

--HG--
branch : trunk

src/server/game/Globals/ObjectMgr.cpp

@@ -416,7 +416,7 @@ void ObjectMgr::AddLocaleString(std::string& s, LocaleConstant locale, StringVec
         int idx = GetOrNewIndexForLocale(locale);
         if (idx >= 0)
         {
-            if (int(data.size()) <= idx)
+            if (data.size() <= size_t(idx))
                 data.resize(idx + 1);
 
             data[idx] = s;

src/server/game/Globals/ObjectMgr.h

@@ -995,6 +995,14 @@ class ObjectMgr
 
         // for wintergrasp only
         GraveYardMap        mGraveYardMap;
+
+        void AddLocaleString(std::string& s, LocaleConstant locale, StringVector& data);
+        inline void GetLocaleString(const StringVector& data, int loc_idx, std::string& value) const
+        {
+            if (data.size() > size_t(loc_idx) && !data[loc_idx].empty())
+                value = data[loc_idx];
+        }
+
     protected:
 
         // first free id for selected id type
@@ -1071,8 +1079,6 @@ class ObjectMgr
 
         int DBCLocaleIndex;
 
-        void AddLocaleString(std::string& s, LocaleConstant locale, StringVector& data);
-
     private:
         void LoadScripts(ScriptsType type);
         void CheckScripts(ScriptsType type, std::set<int32>& ids);