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.cpp87
1 files changed, 40 insertions, 47 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 05d986e3f92..c4721f3cc09 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -390,15 +390,15 @@ void ObjectMgr::LoadCreatureTemplates()
"modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, exp_unk, faction_A, faction_H, npcflag, speed_walk, "
// 22 23 24 25 26 27 28 29 30 31 32 33 34
"speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, unit_flags2, "
- // 35 36 37 38 39 40 41 42 43 44
- "dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, "
- // 45 46 47 48 49 50 51 52 53 54 55
+ // 35 36 37 38 39 40 41 42 43
+ "dynamicflags, family, trainer_type, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, "
+ // 44 45 46 47 48 49 50 51 52 53 54
"type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, "
- // 56 57 58 59 60 61 62 63 64 65 66 67 68 69
+ // 55 56 59 60 61 62 63 64 65 66 67 68 69 70
"spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, "
- // 70 71 72 73 74 75 76 77 78 79 80 81
+ // 71 72 73 74 75 76 77 78 79 80 81 82
"InhabitType, HoverHeight, Health_mod, Mana_mod, Mana_mod_extra, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, "
- // 82 83 84 85 86 87 88
+ // 83 84 85 86 87 88 89
" questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName "
"FROM creature_template;");
@@ -459,48 +459,47 @@ void ObjectMgr::LoadCreatureTemplates()
creatureTemplate.dynamicflags = fields[35].GetUInt32();
creatureTemplate.family = uint32(fields[36].GetUInt8());
creatureTemplate.trainer_type = uint32(fields[37].GetUInt8());
- creatureTemplate.trainer_spell = fields[38].GetUInt32();
- creatureTemplate.trainer_class = uint32(fields[39].GetUInt8());
- creatureTemplate.trainer_race = uint32(fields[40].GetUInt8());
- creatureTemplate.minrangedmg = fields[41].GetFloat();
- creatureTemplate.maxrangedmg = fields[42].GetFloat();
- creatureTemplate.rangedattackpower = uint32(fields[43].GetUInt16());
- creatureTemplate.type = uint32(fields[44].GetUInt8());
- creatureTemplate.type_flags = fields[45].GetUInt32();
- creatureTemplate.type_flags2 = fields[46].GetUInt32();
- creatureTemplate.lootid = fields[47].GetUInt32();
- creatureTemplate.pickpocketLootId = fields[48].GetUInt32();
- creatureTemplate.SkinLootId = fields[49].GetUInt32();
+ creatureTemplate.trainer_class = uint32(fields[38].GetUInt8());
+ creatureTemplate.trainer_race = uint32(fields[39].GetUInt8());
+ creatureTemplate.minrangedmg = fields[40].GetFloat();
+ creatureTemplate.maxrangedmg = fields[41].GetFloat();
+ creatureTemplate.rangedattackpower = uint32(fields[42].GetUInt16());
+ creatureTemplate.type = uint32(fields[43].GetUInt8());
+ creatureTemplate.type_flags = fields[44].GetUInt32();
+ creatureTemplate.type_flags2 = fields[45].GetUInt32();
+ creatureTemplate.lootid = fields[46].GetUInt32();
+ creatureTemplate.pickpocketLootId = fields[47].GetUInt32();
+ creatureTemplate.SkinLootId = fields[48].GetUInt32();
for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
- creatureTemplate.resistance[i] = fields[50 + i - 1].GetInt16();
+ creatureTemplate.resistance[i] = fields[49 + i - 1].GetInt16();
for (uint8 i = 0; i < CREATURE_MAX_SPELLS; ++i)
- creatureTemplate.spells[i] = fields[56 + i].GetUInt32();
-
- creatureTemplate.PetSpellDataId = fields[64].GetUInt32();
- creatureTemplate.VehicleId = fields[65].GetUInt32();
- creatureTemplate.mingold = fields[66].GetUInt32();
- creatureTemplate.maxgold = fields[67].GetUInt32();
- creatureTemplate.AIName = fields[68].GetString();
- creatureTemplate.MovementType = uint32(fields[69].GetUInt8());
- creatureTemplate.InhabitType = uint32(fields[70].GetUInt8());
- creatureTemplate.HoverHeight = fields[71].GetFloat();
- creatureTemplate.ModHealth = fields[72].GetFloat();
- creatureTemplate.ModMana = fields[73].GetFloat();
- creatureTemplate.ModManaExtra = fields[74].GetFloat();
- creatureTemplate.ModArmor = fields[75].GetFloat();
- creatureTemplate.RacialLeader = fields[76].GetBool();
+ creatureTemplate.spells[i] = fields[55 + i].GetUInt32();
+
+ creatureTemplate.PetSpellDataId = fields[63].GetUInt32();
+ creatureTemplate.VehicleId = fields[64].GetUInt32();
+ creatureTemplate.mingold = fields[65].GetUInt32();
+ creatureTemplate.maxgold = fields[66].GetUInt32();
+ creatureTemplate.AIName = fields[67].GetString();
+ creatureTemplate.MovementType = uint32(fields[68].GetUInt8());
+ creatureTemplate.InhabitType = uint32(fields[69].GetUInt8());
+ creatureTemplate.HoverHeight = fields[70].GetFloat();
+ creatureTemplate.ModHealth = fields[71].GetFloat();
+ creatureTemplate.ModMana = fields[72].GetFloat();
+ creatureTemplate.ModManaExtra = fields[73].GetFloat();
+ creatureTemplate.ModArmor = fields[74].GetFloat();
+ creatureTemplate.RacialLeader = fields[75].GetBool();
for (uint8 i = 0; i < MAX_CREATURE_QUEST_ITEMS; ++i)
- creatureTemplate.questItems[i] = fields[77 + i].GetUInt32();
+ creatureTemplate.questItems[i] = fields[76 + i].GetUInt32();
- creatureTemplate.movementId = fields[83].GetUInt32();
- creatureTemplate.RegenHealth = fields[84].GetBool();
- creatureTemplate.equipmentId = fields[85].GetUInt32();
- creatureTemplate.MechanicImmuneMask = fields[86].GetUInt32();
- creatureTemplate.flags_extra = fields[87].GetUInt32();
- creatureTemplate.ScriptID = GetScriptId(fields[88].GetCString());
+ creatureTemplate.movementId = fields[82].GetUInt32();
+ creatureTemplate.RegenHealth = fields[83].GetBool();
+ creatureTemplate.equipmentId = fields[84].GetUInt32();
+ creatureTemplate.MechanicImmuneMask = fields[85].GetUInt32();
+ creatureTemplate.flags_extra = fields[86].GetUInt32();
+ creatureTemplate.ScriptID = GetScriptId(fields[87].GetCString());
++count;
}
@@ -662,12 +661,6 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
continue;
}
- if (cInfo->trainer_spell != difficultyInfo->trainer_spell)
- {
- sLog->outError(LOG_FILTER_SQL, "Creature (Entry: %u) has different `trainer_spell` in difficulty %u mode (Entry: %u).", cInfo->Entry, diff + 1, cInfo->DifficultyEntry[diff]);
- continue;
- }
-
if (!difficultyInfo->AIName.empty())
{
sLog->outError(LOG_FILTER_SQL, "Creature (Entry: %u) lists difficulty %u mode entry %u with `AIName` filled in. `AIName` of difficulty 0 mode creature is always used instead.",