aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2014-09-10 03:35:00 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2014-09-10 03:35:00 +0200
commit9008442a3e0aa7b917ab833aefd05886cdaed96f (patch)
tree93fa27f81d9f7cf768e0b20e80a0f2efaa9985df /src/server/game/Globals/ObjectMgr.cpp
parent48297860f1f26df444d04293418984226d84a0dd (diff)
Core/Creature: added HealthModifierExtra value to creature_template
Requested by @Malcrom
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index bbbecd1d474..66aad228da3 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -439,11 +439,11 @@ void ObjectMgr::LoadCreatureTemplates()
"type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, "
// 50 51 52 53 54 55 56 57 58 59 60 61 62 63
"spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, "
- // 64 65 66 67 68 69 70 71
- "InhabitType, HoverHeight, HealthModifier, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, "
- // 72 73 74 75 76 77 78
+ // 64 65 66 67 68 69 70 71 72
+ "InhabitType, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, "
+ // 73 74 75 76 77 78 79
"RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, "
- // 79 80 81 82 83
+ // 80 81 82 83 84
"movementId, RegenHealth, mechanic_immune_mask, flags_extra, ScriptName "
"FROM creature_template");
@@ -538,21 +538,22 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
creatureTemplate.InhabitType = uint32(fields[64].GetUInt8());
creatureTemplate.HoverHeight = fields[65].GetFloat();
creatureTemplate.ModHealth = fields[66].GetFloat();
- creatureTemplate.ModMana = fields[67].GetFloat();
- creatureTemplate.ModManaExtra = fields[68].GetFloat();
- creatureTemplate.ModArmor = fields[69].GetFloat();
- creatureTemplate.ModDamage = fields[70].GetFloat();
- creatureTemplate.ModExperience = fields[71].GetFloat();
- creatureTemplate.RacialLeader = fields[72].GetBool();
+ creatureTemplate.ModHealthExtra = fields[67].GetFloat();
+ creatureTemplate.ModMana = fields[68].GetFloat();
+ creatureTemplate.ModManaExtra = fields[69].GetFloat();
+ creatureTemplate.ModArmor = fields[70].GetFloat();
+ creatureTemplate.ModDamage = fields[71].GetFloat();
+ creatureTemplate.ModExperience = fields[72].GetFloat();
+ creatureTemplate.RacialLeader = fields[73].GetBool();
for (uint8 i = 0; i < MAX_CREATURE_QUEST_ITEMS; ++i)
- creatureTemplate.questItems[i] = fields[73 + i].GetUInt32();
+ creatureTemplate.questItems[i] = fields[74 + i].GetUInt32();
- creatureTemplate.movementId = fields[79].GetUInt32();
- creatureTemplate.RegenHealth = fields[80].GetBool();
- creatureTemplate.MechanicImmuneMask = fields[81].GetUInt32();
- creatureTemplate.flags_extra = fields[82].GetUInt32();
- creatureTemplate.ScriptID = GetScriptId(fields[83].GetCString());
+ creatureTemplate.movementId = fields[80].GetUInt32();
+ creatureTemplate.RegenHealth = fields[81].GetBool();
+ creatureTemplate.MechanicImmuneMask = fields[82].GetUInt32();
+ creatureTemplate.flags_extra = fields[83].GetUInt32();
+ creatureTemplate.ScriptID = GetScriptId(fields[84].GetCString());
}
void ObjectMgr::LoadCreatureTemplateAddons()