Core/Cleanup: move repeating code for locale strings retrieval into separate method. Related code cleanup.
--HG-- branch : trunk
This commit is contained in:
@@ -2948,8 +2948,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args)
|
||||
if (loc_idx >= 0)
|
||||
{
|
||||
uint8 uloc_idx = uint8(loc_idx);
|
||||
ItemLocale const *il = sObjectMgr.GetItemLocale(pProto->ItemId);
|
||||
if (il)
|
||||
if (ItemLocale const *il = sObjectMgr.GetItemLocale(pProto->ItemId))
|
||||
{
|
||||
if (il->Name.size() > uloc_idx && !il->Name[uloc_idx].empty())
|
||||
{
|
||||
@@ -3263,8 +3262,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args)
|
||||
if (loc_idx >= 0)
|
||||
{
|
||||
uint8 uloc_idx = uint8(loc_idx);
|
||||
QuestLocale const *il = sObjectMgr.GetQuestLocale(qinfo->GetQuestId());
|
||||
if (il)
|
||||
if (QuestLocale const *il = sObjectMgr.GetQuestLocale(qinfo->GetQuestId()))
|
||||
{
|
||||
if (il->Title.size() > uloc_idx && !il->Title[uloc_idx].empty())
|
||||
{
|
||||
@@ -3368,8 +3366,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args)
|
||||
if (loc_idx >= 0)
|
||||
{
|
||||
uint8 uloc_idx = uint8(loc_idx);
|
||||
CreatureLocale const *cl = sObjectMgr.GetCreatureLocale (id);
|
||||
if (cl)
|
||||
if (CreatureLocale const *cl = sObjectMgr.GetCreatureLocale (id))
|
||||
{
|
||||
if (cl->Name.size() > uloc_idx && !cl->Name[uloc_idx].empty ())
|
||||
{
|
||||
@@ -3439,8 +3436,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args)
|
||||
if (loc_idx >= 0)
|
||||
{
|
||||
uint8 uloc_idx = uint8(loc_idx);
|
||||
GameObjectLocale const *gl = sObjectMgr.GetGameObjectLocale(id);
|
||||
if (gl)
|
||||
if (GameObjectLocale const *gl = sObjectMgr.GetGameObjectLocale(id))
|
||||
{
|
||||
if (gl->Name.size() > uloc_idx && !gl->Name[uloc_idx].empty())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user