diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 14619398df2..ce3d12c8ef4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -359,13 +359,13 @@ void ObjectMgr::LoadCreatureTemplates() // "type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, " // 47 48 49 50 51 52 53 54 55 56 57 58 59 // "spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, VehicleId, mingold, maxgold, AIName, MovementType, " - // 60 61 62 63 64 65 66 67 68 69 70 71 72 - // "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, " - // 73 74 75 76 77 78 + // 60 61 62 63 64 65 66 67 68 69 70 71 72 73 + // "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, " + // 74 75 76 77 78 79 // "RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, RegenHealth, " - // 79 80 81 + // 80 81 82 // "mechanic_immune_mask, spell_school_immune_mask, flags_extra, " - // 82 + // 83 // "ScriptName FROM creature_template WHERE entry = ? OR 1 = ?"); WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_CREATURE_TEMPLATE); @@ -469,26 +469,29 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) creatureTemplate.Movement.Rooted = fields[63].GetBool(); if (!fields[64].IsNull()) - creatureTemplate.Movement.Chase = static_cast<CreatureChaseMovementType>(fields[64].GetUInt8()); - - creatureTemplate.HoverHeight = fields[65].GetFloat(); - creatureTemplate.ModHealth = fields[66].GetFloat(); - 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(); - creatureTemplate.movementId = fields[74].GetUInt32(); - creatureTemplate.CreatureDifficultyID = fields[75].GetInt32(); - creatureTemplate.WidgetSetID = fields[76].GetInt32(); - creatureTemplate.WidgetSetUnitConditionID = fields[77].GetInt32(); - creatureTemplate.RegenHealth = fields[78].GetBool(); - creatureTemplate.MechanicImmuneMask = fields[79].GetUInt32(); - creatureTemplate.SpellSchoolImmuneMask = fields[80].GetUInt32(); - creatureTemplate.flags_extra = fields[81].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[82].GetString()); + creatureTemplate.Movement.Chase = static_cast<CreatureChaseMovementType>(fields[64].GetUInt8()); + + if (!fields[65].IsNull()) + creatureTemplate.Movement.Random = static_cast<CreatureRandomMovementType>(fields[65].GetUInt8()); + + creatureTemplate.HoverHeight = fields[66].GetFloat(); + creatureTemplate.ModHealth = fields[67].GetFloat(); + creatureTemplate.ModHealthExtra = fields[68].GetFloat(); + creatureTemplate.ModMana = fields[69].GetFloat(); + creatureTemplate.ModManaExtra = fields[70].GetFloat(); + creatureTemplate.ModArmor = fields[71].GetFloat(); + creatureTemplate.ModDamage = fields[72].GetFloat(); + creatureTemplate.ModExperience = fields[73].GetFloat(); + creatureTemplate.RacialLeader = fields[74].GetBool(); + creatureTemplate.movementId = fields[75].GetUInt32(); + creatureTemplate.CreatureDifficultyID = fields[76].GetInt32(); + creatureTemplate.WidgetSetID = fields[77].GetInt32(); + creatureTemplate.WidgetSetUnitConditionID = fields[78].GetInt32(); + creatureTemplate.RegenHealth = fields[79].GetBool(); + creatureTemplate.MechanicImmuneMask = fields[80].GetUInt32(); + creatureTemplate.SpellSchoolImmuneMask = fields[81].GetUInt32(); + creatureTemplate.flags_extra = fields[82].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[83].GetString()); } void ObjectMgr::LoadCreatureTemplateModels() @@ -1063,6 +1066,13 @@ void ObjectMgr::CheckCreatureMovement(char const* table, uint64 id, CreatureMove table, uint32(creatureMovement.Chase), id); creatureMovement.Chase = CreatureChaseMovementType::Run; } + + if (creatureMovement.Random >= CreatureRandomMovementType::Max) + { + TC_LOG_ERROR("sql.sql", "`%s`.`Random` wrong value (%u) for Id " UI64FMTD ", setting to Walk.", + table, uint32(creatureMovement.Random), id); + creatureMovement.Random = CreatureRandomMovementType::Walk; + } } void ObjectMgr::LoadCreatureAddons() @@ -1410,7 +1420,8 @@ void ObjectMgr::LoadCreatureMovementOverrides() _creatureMovementOverrides.clear(); - QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase from creature_movement_override"); + QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase, Random from creature_movement_override"); + if (!result) { TC_LOG_INFO("server.loading", ">> Loaded 0 creature movement overrides. DB table `creature_movement_override` is empty!"); @@ -1433,6 +1444,7 @@ void ObjectMgr::LoadCreatureMovementOverrides() movement.Flight = static_cast<CreatureFlightMovementType>(fields[3].GetUInt8()); movement.Rooted = fields[4].GetBool(); movement.Chase = static_cast<CreatureChaseMovementType>(fields[5].GetUInt8()); + movement.Random = static_cast<CreatureRandomMovementType>(fields[6].GetUInt8()); CheckCreatureMovement("creature_movement_override", spawnId, movement); } |