From 9435d6aeb21fba6b1d323d0f1b638caeeb17a863 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 25 Jul 2019 01:16:55 +0200 Subject: [PATCH] Core: fixed some warnings --- src/server/game/Entities/Object/Object.cpp | 4 ++-- src/server/game/Entities/Player/Player.h | 5 +++++ src/server/game/Entities/Vehicle/VehicleDefines.h | 2 ++ src/server/game/Spells/SpellInfo.h | 6 ++++-- src/server/scripts/Spells/spell_shaman.cpp | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index c1497fa181..6dc056de6d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1181,8 +1181,8 @@ void MovementInfo::OutDebug() WorldObject::WorldObject(bool isWorldObject) : WorldLocation(), LastUsedScriptID(0), m_name(""), m_isActive(false), m_isFarVisible(false), m_isWorldObject(isWorldObject), m_zoneScript(nullptr), -m_transport(nullptr), m_zoneId(0), m_areaId(0), m_staticFloorZ(VMAP_INVALID_HEIGHT), m_currMap(nullptr), m_InstanceId(0), -m_phaseMask(PHASEMASK_NORMAL), _dbPhase(0), m_notifyflags(0), m_executed_notifies(0), +m_transport(nullptr), m_zoneId(0), m_areaId(0), m_staticFloorZ(VMAP_INVALID_HEIGHT), m_outdoors(true; m_currMap(nullptr), +m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), _dbPhase(0), m_notifyflags(0), m_executed_notifies(0), m_aiAnimKitId(0), m_movementAnimKitId(0), m_meleeAnimKitId(0) { m_serverSideVisibility.SetValue(SERVERSIDE_VISIBILITY_GHOST, GHOST_VISIBILITY_ALIVE | GHOST_VISIBILITY_GHOST); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 358ac16dae..2da5228867 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1001,6 +1001,11 @@ struct PlayerTalentInfo struct TalentSpecInfo { + TalentSpecInfo() : Talents(nullptr), TalentTree(0) + { + memset(Glyphs, 0, MAX_GLYPH_SLOT_INDEX * sizeof(uint32)); + } + PlayerTalentMap* Talents; uint32 Glyphs[MAX_GLYPH_SLOT_INDEX]; uint32 TalentTree; diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h index 7323517f27..73a4addb2b 100644 --- a/src/server/game/Entities/Vehicle/VehicleDefines.h +++ b/src/server/game/Entities/Vehicle/VehicleDefines.h @@ -78,6 +78,8 @@ enum VehicleSpells struct PassengerInfo { + PassengerInfo() : IsUnselectable(false) { } + ObjectGuid Guid; bool IsUnselectable; diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 417278c1de..e05969a989 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -264,8 +264,10 @@ public: SpellEffectInfo() : _spellInfo(nullptr), _effIndex(0), Effect(0), ApplyAuraName(0), Amplitude(0), DieSides(0), RealPointsPerLevel(0), BasePoints(0), PointsPerComboPoint(0), ValueMultiplier(0), DamageMultiplier(0), - BonusMultiplier(0), MiscValue(0), MiscValueB(0), Mechanic(MECHANIC_NONE), RadiusEntry(nullptr), ChainTarget(0), - ItemType(0), TriggerSpell(0), ImplicitTargetConditions(nullptr) {} + BonusMultiplier(0), MiscValue(0), MiscValueB(0), Mechanic(MECHANIC_NONE), RadiusEntry(nullptr), MaxRadiusEntry(nullptr), + ChainTarget(0), ItemType(0), TriggerSpell(0), ImplicitTargetConditions(nullptr), ScalingMultiplier(0), DeltaScalingMultiplier(0), + ComboScalingMultiplier(0) { } + SpellEffectInfo(SpellEntry const* spellEntry, SpellInfo const* spellInfo, uint8 effIndex, SpellEffectEntry const* effect); bool IsEffect() const; diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index be1e9271e6..3e8d09faeb 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -1651,7 +1651,7 @@ class spell_sha_healing_rain_triggered : public SpellScript OnEffectHitTarget += SpellEffectFn(spell_sha_healing_rain_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } private: - uint8 _targets; + uint8 _targets = 0; }; class spell_sha_earthliving_weapon : public SpellScriptLoader