aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 236f19c21f6..f5542024956 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -729,7 +729,7 @@ void ObjectMgr::LoadCreatureTemplateAddons()
uint32 entry = fields[0].GetUInt32();
- if (!sObjectMgr->GetCreatureTemplate(entry))
+ if (!GetCreatureTemplate(entry))
{
TC_LOG_ERROR("sql.sql", "Creature template (Entry: %u) does not exist but has a record in `creature_template_addon`", entry);
continue;
@@ -1548,7 +1548,7 @@ void ObjectMgr::LoadEquipmentTemplates()
uint32 entry = fields[0].GetUInt32();
- if (!sObjectMgr->GetCreatureTemplate(entry))
+ if (!GetCreatureTemplate(entry))
{
TC_LOG_ERROR("sql.sql", "Creature template (CreatureID: %u) does not exist but has a record in `creature_equip_template`", entry);
continue;
@@ -3479,13 +3479,13 @@ void ObjectMgr::LoadVehicleTemplateAccessories()
uint8 summonType = fields[4].GetUInt8();
uint32 summonTimer = fields[5].GetUInt32();
- if (!sObjectMgr->GetCreatureTemplate(entry))
+ if (!GetCreatureTemplate(entry))
{
TC_LOG_ERROR("sql.sql", "Table `vehicle_template_accessory`: creature template entry %u does not exist.", entry);
continue;
}
- if (!sObjectMgr->GetCreatureTemplate(accessory))
+ if (!GetCreatureTemplate(accessory))
{
TC_LOG_ERROR("sql.sql", "Table `vehicle_template_accessory`: Accessory %u does not exist.", accessory);
continue;
@@ -3527,7 +3527,7 @@ void ObjectMgr::LoadVehicleTemplate()
uint32 creatureId = fields[0].GetUInt32();
- if (!sObjectMgr->GetCreatureTemplate(creatureId))
+ if (!GetCreatureTemplate(creatureId))
{
TC_LOG_ERROR("sql.sql", "Table `vehicle_template`: Vehicle %u does not exist.", creatureId);
continue;
@@ -3569,7 +3569,7 @@ void ObjectMgr::LoadVehicleAccessories()
uint8 uiSummonType = fields[4].GetUInt8();
uint32 uiSummonTimer= fields[5].GetUInt32();
- if (!sObjectMgr->GetCreatureTemplate(uiAccessory))
+ if (!GetCreatureTemplate(uiAccessory))
{
TC_LOG_ERROR("sql.sql", "Table `vehicle_accessory`: Accessory %u does not exist.", uiAccessory);
continue;
@@ -3660,7 +3660,7 @@ void ObjectMgr::LoadPetLevelInfo()
Field* fields = result->Fetch();
uint32 creature_id = fields[0].GetUInt32();
- if (!sObjectMgr->GetCreatureTemplate(creature_id))
+ if (!GetCreatureTemplate(creature_id))
{
TC_LOG_ERROR("sql.sql", "Wrong creature id %u in `pet_levelstats` table, ignoring.", creature_id);
continue;
@@ -4875,7 +4875,7 @@ void ObjectMgr::LoadQuests()
if (qinfo->_sourceItemId)
{
- if (!sObjectMgr->GetItemTemplate(qinfo->_sourceItemId))
+ if (!GetItemTemplate(qinfo->_sourceItemId))
{
TC_LOG_ERROR("sql.sql", "Quest %u has `SourceItemId` = %u but item with entry %u does not exist, quest can't be done.",
qinfo->GetQuestId(), qinfo->_sourceItemId, qinfo->_sourceItemId);
@@ -4940,22 +4940,22 @@ void ObjectMgr::LoadQuests()
switch (obj.Type)
{
case QUEST_OBJECTIVE_ITEM:
- if (!sObjectMgr->GetItemTemplate(obj.ObjectID))
+ if (!GetItemTemplate(obj.ObjectID))
TC_LOG_ERROR("sql.sql", "Quest %u objective %u has non existing item entry %u, quest can't be done.",
qinfo->GetQuestId(), obj.ID, obj.ObjectID);
break;
case QUEST_OBJECTIVE_MONSTER:
- if (!sObjectMgr->GetCreatureTemplate(obj.ObjectID))
+ if (!GetCreatureTemplate(obj.ObjectID))
TC_LOG_ERROR("sql.sql", "Quest %u objective %u has non existing creature entry %u, quest can't be done.",
qinfo->GetQuestId(), obj.ID, uint32(obj.ObjectID));
break;
case QUEST_OBJECTIVE_GAMEOBJECT:
- if (!sObjectMgr->GetGameObjectTemplate(obj.ObjectID))
+ if (!GetGameObjectTemplate(obj.ObjectID))
TC_LOG_ERROR("sql.sql", "Quest %u objective %u has non existing gameobject entry %u, quest can't be done.",
qinfo->GetQuestId(), obj.ID, uint32(obj.ObjectID));
break;
case QUEST_OBJECTIVE_TALKTO:
- if (!sObjectMgr->GetCreatureTemplate(obj.ObjectID))
+ if (!GetCreatureTemplate(obj.ObjectID))
TC_LOG_ERROR("sql.sql", "Quest %u objective %u has non existing creature entry %u, quest can't be done.",
qinfo->GetQuestId(), obj.ID, uint32(obj.ObjectID));
break;
@@ -4982,7 +4982,7 @@ void ObjectMgr::LoadQuests()
TC_LOG_ERROR("sql.sql", "Quest %u objective %u has non existing spell id %d", qinfo->GetQuestId(), obj.ID, obj.ObjectID);
break;
case QUEST_OBJECTIVE_WINPETBATTLEAGAINSTNPC:
- if (obj.ObjectID && !sObjectMgr->GetCreatureTemplate(obj.ObjectID))
+ if (obj.ObjectID && !GetCreatureTemplate(obj.ObjectID))
TC_LOG_ERROR("sql.sql", "Quest %u objective %u has non existing creature entry %u, quest can't be done.",
qinfo->GetQuestId(), obj.ID, uint32(obj.ObjectID));
break;
@@ -5021,7 +5021,7 @@ void ObjectMgr::LoadQuests()
uint32 id = qinfo->ItemDrop[j];
if (id)
{
- if (!sObjectMgr->GetItemTemplate(id))
+ if (!GetItemTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Quest %u has `ItemDrop%d` = %u but item with entry %u does not exist, quest can't be done.",
qinfo->GetQuestId(), j+1, id, id);
@@ -5046,7 +5046,7 @@ void ObjectMgr::LoadQuests()
switch (qinfo->RewardChoiceItemType[j])
{
case LootItemType::Item:
- if (!sObjectMgr->GetItemTemplate(id))
+ if (!GetItemTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Quest %u has `RewardChoiceItemId%d` = %u but item with entry %u does not exist, quest will not reward this item.",
qinfo->GetQuestId(), j + 1, id, id);
@@ -5087,7 +5087,7 @@ void ObjectMgr::LoadQuests()
uint32 id = qinfo->RewardItemId[j];
if (id)
{
- if (!sObjectMgr->GetItemTemplate(id))
+ if (!GetItemTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Quest %u has `RewardItemId%d` = %u but item with entry %u does not exist, quest will not reward this item.",
qinfo->GetQuestId(), j+1, id, id);
@@ -5318,7 +5318,7 @@ void ObjectMgr::LoadQuests()
break;
}
- qinfo = const_cast<Quest*>(sObjectMgr->GetQuestTemplate(breadcrumbForQuestId));
+ qinfo = const_cast<Quest*>(GetQuestTemplate(breadcrumbForQuestId));
//every quest has a list of every breadcrumb towards it
qinfo->DependentBreadcrumbQuests.push_back(qid);
@@ -5467,14 +5467,14 @@ void ObjectMgr::LoadQuestGreetingLocales()
switch (type)
{
case 0: // Creature
- if (!sObjectMgr->GetCreatureTemplate(id))
+ if (!GetCreatureTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Table `quest_greeting_locale`: creature template entry %u does not exist.", id);
continue;
}
break;
case 1: // GameObject
- if (!sObjectMgr->GetGameObjectTemplate(id))
+ if (!GetGameObjectTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Table `quest_greeting_locale`: gameobject template entry %u does not exist.", id);
continue;
@@ -6223,7 +6223,7 @@ void ObjectMgr::LoadInstanceTemplate()
InstanceTemplate instanceTemplate;
instanceTemplate.Parent = uint32(fields[1].GetUInt16());
- instanceTemplate.ScriptId = sObjectMgr->GetScriptId(fields[2].GetString());
+ instanceTemplate.ScriptId = GetScriptId(fields[2].GetString());
_instanceTemplateStore[mapID] = instanceTemplate;
@@ -6670,14 +6670,14 @@ void ObjectMgr::LoadQuestGreetings()
switch (type)
{
case 0: // Creature
- if (!sObjectMgr->GetCreatureTemplate(id))
+ if (!GetCreatureTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Table `quest_greeting`: creature template entry %u does not exist.", id);
continue;
}
break;
case 1: // GameObject
- if (!sObjectMgr->GetGameObjectTemplate(id))
+ if (!GetGameObjectTemplate(id))
{
TC_LOG_ERROR("sql.sql", "Table `quest_greeting`: gameobject template entry %u does not exist.", id);
continue;
@@ -7390,7 +7390,7 @@ AreaTriggerStruct const* ObjectMgr::GetGoBackTrigger(uint32 Map) const
return nullptr;
if (mapEntry->IsDungeon())
- if (InstanceTemplate const* iTemplate = sObjectMgr->GetInstanceTemplate(Map))
+ if (InstanceTemplate const* iTemplate = GetInstanceTemplate(Map))
parentId = iTemplate->Parent;
uint32 entrance_map = parentId.value_or(mapEntry->CorpseMapID);
@@ -7879,7 +7879,7 @@ void ObjectMgr::LoadGameObjectTemplateAddons()
uint32 entry = fields[0].GetUInt32();
- GameObjectTemplate const* got = sObjectMgr->GetGameObjectTemplate(entry);
+ GameObjectTemplate const* got = GetGameObjectTemplate(entry);
if (!got)
{
TC_LOG_ERROR("sql.sql", "GameObject template (Entry: %u) does not exist but has a record in `gameobject_template_addon`", entry);
@@ -8445,7 +8445,7 @@ void ObjectMgr::LoadQuestPOI()
int32 spawnTrackingID = fields[13].GetInt32();
bool alwaysAllowMergingBlobs = fields[14].GetBool();
- if (!sObjectMgr->GetQuestTemplate(questID))
+ if (!GetQuestTemplate(questID))
TC_LOG_ERROR("sql.sql", "`quest_poi` quest id (%u) Idx1 (%u) does not exist in `quest_template`", questID, idx1);
if (std::map<int32, std::vector<QuestPOIBlobPoint>>* blobs = Trinity::Containers::MapGetValuePtr(allPoints, questID))
@@ -9804,7 +9804,7 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, uint8 type, bool per
bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, VendorItem const& vItem, Player* player, std::set<uint32>* skip_vendors, uint32 ORnpcflag) const
{
- CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(vendor_entry);
+ CreatureTemplate const* cInfo = GetCreatureTemplate(vendor_entry);
if (!cInfo)
{
if (player)
@@ -9829,7 +9829,7 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, VendorItem const& vItem,
return false;
}
- if ((vItem.Type == ITEM_VENDOR_TYPE_ITEM && !sObjectMgr->GetItemTemplate(vItem.item)) ||
+ if ((vItem.Type == ITEM_VENDOR_TYPE_ITEM && !GetItemTemplate(vItem.item)) ||
(vItem.Type == ITEM_VENDOR_TYPE_CURRENCY && !sCurrencyTypesStore.LookupEntry(vItem.item)))
{
if (player)
@@ -10154,9 +10154,9 @@ void ObjectMgr::LoadFactionChangeQuests()
uint32 alliance = fields[0].GetUInt32();
uint32 horde = fields[1].GetUInt32();
- if (!sObjectMgr->GetQuestTemplate(alliance))
+ if (!GetQuestTemplate(alliance))
TC_LOG_ERROR("sql.sql", "Quest %u (alliance_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", alliance);
- else if (!sObjectMgr->GetQuestTemplate(horde))
+ else if (!GetQuestTemplate(horde))
TC_LOG_ERROR("sql.sql", "Quest %u (horde_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", horde);
else
FactionChangeQuests[alliance] = horde;
@@ -10921,7 +10921,7 @@ void ObjectMgr::LoadSceneTemplates()
sceneTemplate.PlaybackFlags = static_cast<SceneFlag>(fields[1].GetUInt32());
sceneTemplate.ScenePackageId = fields[2].GetUInt32();
sceneTemplate.Encrypted = fields[3].GetUInt8() != 0;
- sceneTemplate.ScriptId = sObjectMgr->GetScriptId(fields[4].GetCString());
+ sceneTemplate.ScriptId = GetScriptId(fields[4].GetCString());
} while (templates->NextRow());