diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Creature/Creature.h | 4 | ||||
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 0ece92cc86f..5f9f221ddac 100755 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -76,6 +76,8 @@ enum CreatureFlagsExtra #define MAX_CREATURE_QUEST_ITEMS 6 +#define MAX_EQUIPMENT_ITEMS 3 + // from `creature_template` table struct CreatureTemplate { @@ -228,7 +230,7 @@ struct PointOfInterestLocale struct EquipmentInfo { - uint32 ItemEntry[3]; + uint32 ItemEntry[MAX_EQUIPMENT_ITEMS]; }; // Benchmarked: Faster than std::map (insert/find) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f40fbc9f431..09101c69a42 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1170,7 +1170,7 @@ void ObjectMgr::LoadEquipmentTemplates() equipmentInfo.ItemEntry[1] = fields[2].GetUInt32(); equipmentInfo.ItemEntry[2] = fields[3].GetUInt32(); - for (uint8 i = 0; i < 3; ++i) + for (uint8 i = 0; i < MAX_EQUIPMENT_ITEMS; ++i) { if (!equipmentInfo.ItemEntry[i]) continue; @@ -5768,8 +5768,6 @@ void ObjectMgr::LoadPageTexts() { Field* fields = result->Fetch(); - const char* text = fields[1].GetCString(); - PageText pageText; pageText.Text = fields[1].GetString(); @@ -5865,8 +5863,8 @@ void ObjectMgr::LoadInstanceTemplate() InstanceTemplate instanceTemplate; instanceTemplate.AllowMount = fields[3].GetBool(); - instanceTemplate.Parent = fields[1].GetUInt16(); - instanceTemplate.ScriptId = sObjectMgr->GetScriptId(fields[2].GetCString()); + instanceTemplate.Parent = uint32(fields[1].GetUInt16()); + instanceTemplate.ScriptId = sObjectMgr->GetScriptId(fields[2].GetCString()); InstanceTemplateStore[mapID] = instanceTemplate; |