josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-27 00:57:49 +06:00
parent 4b5b4afbe9
commit e3c2bdb722
11 changed files with 85 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Achievements/AchievementMgr.cpp
+7 -27
View File
@@ -1946,10 +1946,8 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
{
if (AchievementRewardLocale const* loc = sAchievementMgr.GetAchievementRewardLocale(achievement))
{
if (loc->subject.size() > size_t(loc_idx) && !loc->subject[loc_idx].empty())
subject = loc->subject[loc_idx];
if (loc->text.size() > size_t(loc_idx) && !loc->text[loc_idx].empty())
text = loc->text[loc_idx];
sObjectMgr.GetLocaleString(loc->subject, loc_idx, subject);
sObjectMgr.GetLocaleString(loc->text, loc_idx, text);
}
}
@@ -2420,30 +2418,12 @@ void AchievementGlobalMgr::LoadRewardLocales()
for (int i = 1; i < MAX_LOCALE; ++i)
{
std::string str = fields[1+2*(i-1)].GetCppString();
if (!str.empty())
{
int idx = sObjectMgr.GetOrNewIndexForLocale(LocaleConstant(i));
if (idx >= 0)
{
if (data.subject.size() <= size_t(idx))
data.subject.resize(idx+1);
LocaleConstant locale = (LocaleConstant) i;
std::string str = fields[1 + 2 * (i - 1)].GetCppString();
sObjectMgr.AddLocaleString(str, locale, data.subject);
data.subject[idx] = str;
}
}
str = fields[1+2*(i-1)+1].GetCppString();
if (!str.empty())
{
int idx = sObjectMgr.GetOrNewIndexForLocale(LocaleConstant(i));
if (idx >= 0)
{
if (data.text.size() <= size_t(idx))
data.text.resize(idx+1);
data.text[idx] = str;
}
}
str = fields[1 + 2 * (i - 1) + 1].GetCppString();
sObjectMgr.AddLocaleString(str, locale, data.text);
}
} while (result->NextRow());