diff --git a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.cpp b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.cpp index b5c00b7afd..6d583b2462 100644 --- a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.cpp +++ b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.cpp @@ -26,10 +26,10 @@ EndScriptData */ instance_blood_furnace::instance_blood_furnace(Map* map) : ScriptedInstance(map), m_uiBroggokEventTimer(90 * IN_MILLISECONDS), - m_uiBroggokEventDelay(0), m_uiBroggokEventPhase(0), m_uiRandYellTimer(90000), m_crackTimer(30000), + m_uiBroggokEventDelay(0), m_uiBroggokEventDelaySpawn(false) { Initialize(); diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp index 0bf40acd9a..9552dcfe40 100644 --- a/src/game/Entities/Creature.cpp +++ b/src/game/Entities/Creature.cpp @@ -138,7 +138,7 @@ Creature::Creature(CreatureSubtype subtype) : Unit(), m_lootStatus(CREATURE_LOOT_STATUS_NONE), m_corpseAccelerationDecayDelay(MINIMUM_LOOTING_TIME), m_respawnTime(0), m_respawnDelay(25), m_respawnOverriden(false), m_respawnOverrideOnce(false), m_corpseDelay(60), m_canAggro(false), - m_respawnradius(5.0f), m_checkForHelp(true), m_interactionPauseTimer(0), m_subtype(subtype), m_defaultMovementType(IDLE_MOTION_TYPE), + m_checkForHelp(true), m_respawnradius(5.0f), m_interactionPauseTimer(0), m_subtype(subtype), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0), m_detectionRange(20.f), m_AlreadyCallAssistance(false), m_canCallForAssistance(true), m_temporaryFactionFlags(TEMPFACTION_NONE), m_originalEntry(0), m_gameEventVendorId(0), diff --git a/src/game/MotionGenerators/PathMovementGenerator.cpp b/src/game/MotionGenerators/PathMovementGenerator.cpp index 74b0ec1e4e..647126111b 100644 --- a/src/game/MotionGenerators/PathMovementGenerator.cpp +++ b/src/game/MotionGenerators/PathMovementGenerator.cpp @@ -27,7 +27,7 @@ #include AbstractPathMovementGenerator::AbstractPathMovementGenerator(const Movement::PointsArray& path, float orientation, int32 offset/* = 0*/, bool cyclic/* = true*/) : - m_pathIndex(offset), m_orientation(orientation), m_firstCycle(false), m_startPoint(0), m_speedChanged(false), m_cyclic(cyclic) + m_pathIndex(offset), m_orientation(orientation), m_cyclic(cyclic), m_firstCycle(false), m_startPoint(0), m_speedChanged(false) { for (size_t i = 0; i < path.size(); ++i) m_path[i] = { path[i].x, path[i].y, path[i].z, ((i + 1) == path.size() ? orientation : 0), 0, 0 }; diff --git a/src/game/Spells/Scripts/SpellScript.h b/src/game/Spells/Scripts/SpellScript.h index 2e74077a97..94174818da 100644 --- a/src/game/Spells/Scripts/SpellScript.h +++ b/src/game/Spells/Scripts/SpellScript.h @@ -77,7 +77,7 @@ struct AuraCalcData { Unit* caster; Unit* target; SpellEntry const* spellProto; SpellEffectIndex effIdx; Item* castItem; Aura* aura; // cannot be used in auras that utilize stacking in checkcast - can be nullptr - AuraCalcData(Aura* aura, Unit* caster, Unit* target, SpellEntry const* spellProto, SpellEffectIndex effIdx, Item* castItem) : caster(caster), target(target), spellProto(spellProto), effIdx(effIdx), aura(aura), castItem(castItem) {} + AuraCalcData(Aura* aura, Unit* caster, Unit* target, SpellEntry const* spellProto, SpellEffectIndex effIdx, Item* castItem) : caster(caster), target(target), spellProto(spellProto), effIdx(effIdx), castItem(castItem), aura(aura) {} }; struct AuraScript diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp index 82238f4190..744d778e58 100644 --- a/src/game/Spells/SpellAuras.cpp +++ b/src/game/Spells/SpellAuras.cpp @@ -329,7 +329,7 @@ Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 const* curr m_spellmod(nullptr), m_periodicTimer(0), m_periodicTick(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_effIndex(eff), m_positive(false), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false), m_magnetUsed(false), m_spellAuraHolder(holder), - m_scriptValue(0), m_storage(nullptr), m_scriptRef(this, NoopAuraDeleter()), m_affectOverriden(false) + m_scriptValue(0), m_storage(nullptr), m_affectOverriden(false), m_scriptRef(this, NoopAuraDeleter()) { MANGOS_ASSERT(target); MANGOS_ASSERT(spellproto && spellproto == sSpellTemplate.LookupEntry(spellproto->Id) && "`info` must be pointer to sSpellTemplate element");