diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 61 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 46 | ||||
| -rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.h | 6 |
3 files changed, 43 insertions, 70 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 077b9718f72..f66bfcc1e69 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -302,26 +302,23 @@ SpellNonMeleeDamage::SpellNonMeleeDamage(Unit* _attacker, Unit* _target, SpellIn } Unit::Unit(bool isWorldObject) : - WorldObject(isWorldObject), m_lastSanctuaryTime(0), LastCharmerGUID(), movespline(new Movement::MoveSpline()), + WorldObject(isWorldObject), m_lastSanctuaryTime(0), LastCharmerGUID(), movespline(std::make_unique<Movement::MoveSpline>()), m_ControlledByPlayer(false), m_procDeep(0), m_procChainLength(0), m_transformSpell(0), m_removedAurasCount(0), m_interruptMask(SpellAuraInterruptFlags::None), m_interruptMask2(SpellAuraInterruptFlags2::None), m_unitMovedByMe(nullptr), m_playerMovingMe(nullptr), m_charmer(nullptr), m_charmed(nullptr), - i_motionMaster(new MotionMaster(this)), m_regenTimer(0), m_vehicle(nullptr), - m_vehicleKit(nullptr), m_unitTypeMask(UNIT_MASK_NONE), m_Diminishing(), m_combatManager(this), + i_motionMaster(std::make_unique<MotionMaster>(this)), m_regenTimer(0), m_vehicle(nullptr), + m_unitTypeMask(UNIT_MASK_NONE), m_Diminishing(), m_combatManager(this), m_threatManager(this), m_aiLocked(false), _playHoverAnim(false), _aiAnimKitId(0), _movementAnimKitId(0), _meleeAnimKitId(0), - _spellHistory(new SpellHistory(this)) + _spellHistory(std::make_unique<SpellHistory>(this)) { m_objectType |= TYPEMASK_UNIT; m_objectTypeId = TYPEID_UNIT; m_updateFlag.MovementUpdate = true; - for (uint32 i = 0; i < MAX_ATTACK; ++i) - { - m_baseAttackSpeed[i] = 0; - m_modAttackSpeedPct[i] = 1.0f; - m_attackTimer[i] = 0; - } + m_baseAttackSpeed = { }; + m_attackTimer = { }; + m_modAttackSpeedPct.fill(1.0f); m_canDualWield = false; @@ -330,14 +327,7 @@ Unit::Unit(bool isWorldObject) : m_state = 0; m_deathState = ALIVE; - for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) - m_currentSpells[i] = nullptr; - - for (uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) - m_SummonSlot[i].Clear(); - - for (uint8 i = 0; i < MAX_GAMEOBJECT_SLOT; ++i) - m_ObjectSlot[i].Clear(); + m_currentSpells = { }; m_auraUpdateIterator = m_ownedAuras.end(); @@ -360,12 +350,9 @@ Unit::Unit(bool isWorldObject) : m_weaponDamage[i][MAXDAMAGE] = BASE_MAXDAMAGE; } - for (uint8 i = 0; i < MAX_STATS; ++i) - { - m_createStats[i] = 0.0f; - m_floatStatPosBuff[i] = 0.0f; - m_floatStatNegBuff[i] = 0.0f; - } + m_createStats = { }; + m_floatStatPosBuff = { }; + m_floatStatNegBuff = { }; m_attacking = nullptr; if (GetTypeId() == TYPEID_PLAYER) @@ -382,14 +369,10 @@ Unit::Unit(bool isWorldObject) : } m_baseSpellCritChance = 5; - for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) - m_speed_rate[i] = 1.0f; - - m_charmInfo = nullptr; + m_speed_rate.fill(1.0f); // remove aurastates allowing special moves - for (uint8 i = 0; i < MAX_REACTIVE; ++i) - m_reactiveTimer[i] = 0; + m_reactiveTimer = { }; m_cleanupDone = false; m_duringRemoveFromWorld = false; @@ -411,22 +394,19 @@ Unit::Unit(bool isWorldObject) : Unit::~Unit() { // set current spells as deletable - for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) + for (size_t i = 0; i < m_currentSpells.size(); ++i) + { if (m_currentSpells[i]) { m_currentSpells[i]->SetReferencedFromCurrent(false); m_currentSpells[i] = nullptr; } + } m_Events.KillAllEvents(true); _DeleteRemovedAuras(); - delete i_motionMaster; - delete m_charmInfo; - delete movespline; - delete _spellHistory; - ASSERT(!m_duringRemoveFromWorld); ASSERT(!m_attacking); ASSERT(m_attackers.empty()); @@ -9531,9 +9511,9 @@ void Unit::UpdateCharmAI() CharmInfo* Unit::InitCharmInfo() { if (!m_charmInfo) - m_charmInfo = new CharmInfo(this); + m_charmInfo = std::make_unique<CharmInfo>(this); - return m_charmInfo; + return m_charmInfo.get(); } void Unit::DeleteCharmInfo() @@ -9542,7 +9522,6 @@ void Unit::DeleteCharmInfo() return; m_charmInfo->RestoreState(); - delete m_charmInfo; m_charmInfo = nullptr; } @@ -11510,7 +11489,7 @@ bool Unit::CreateVehicleKit(uint32 id, uint32 creatureEntry, bool loading /*= fa if (!vehInfo) return false; - m_vehicleKit = new Vehicle(this, vehInfo, creatureEntry); + m_vehicleKit = std::make_unique<Vehicle>(this, vehInfo, creatureEntry); m_updateFlag.Vehicle = true; m_unitTypeMask |= UNIT_MASK_VEHICLE; @@ -11529,8 +11508,6 @@ void Unit::RemoveVehicleKit(bool onRemoveFromWorld /*= false*/) SendSetVehicleRecId(0); m_vehicleKit->Uninstall(); - delete m_vehicleKit; - m_vehicleKit = nullptr; m_updateFlag.Vehicle = false; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 0f63cc369a9..dc71330822e 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1317,7 +1317,7 @@ class TC_GAME_API Unit : public WorldObject bool isPossessing() const; bool isPossessing(Unit* u) const; - CharmInfo* GetCharmInfo() { return m_charmInfo; } + CharmInfo* GetCharmInfo() { return m_charmInfo.get(); } CharmInfo* InitCharmInfo(); void DeleteCharmInfo(); void SetPetNumberForClient(uint32 petNumber) { SetUpdateFieldValue(m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::PetNumber), petNumber); } @@ -1553,11 +1553,11 @@ class TC_GAME_API Unit : public WorldObject void SetSilencedSchoolMask(SpellSchoolMask schoolMask) { SetUpdateFieldFlagValue(m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::SilencedSchoolMask), schoolMask); } void ReplaceAllSilencedSchoolMask(SpellSchoolMask schoolMask) { SetUpdateFieldValue(m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::SilencedSchoolMask), schoolMask); } - SpellHistory* GetSpellHistory() { return _spellHistory; } - SpellHistory const* GetSpellHistory() const { return _spellHistory; } + SpellHistory* GetSpellHistory() { return _spellHistory.get(); } + SpellHistory const* GetSpellHistory() const { return _spellHistory.get(); } - ObjectGuid m_SummonSlot[MAX_SUMMON_SLOT]; - ObjectGuid m_ObjectSlot[MAX_GAMEOBJECT_SLOT]; + std::array<ObjectGuid, MAX_SUMMON_SLOT> m_SummonSlot; + std::array<ObjectGuid, MAX_GAMEOBJECT_SLOT> m_ObjectSlot; ShapeshiftForm GetShapeshiftForm() const { return ShapeshiftForm(*m_unitData->ShapeshiftForm); } void SetShapeshiftForm(ShapeshiftForm form); @@ -1572,9 +1572,9 @@ class TC_GAME_API Unit : public WorldObject float m_modSpellHitChance; int32 m_baseSpellCritChance; - uint32 m_baseAttackSpeed[MAX_ATTACK]; - float m_modAttackSpeedPct[MAX_ATTACK]; - uint32 m_attackTimer[MAX_ATTACK]; + std::array<uint32, MAX_ATTACK> m_baseAttackSpeed; + std::array<float, MAX_ATTACK> m_modAttackSpeedPct; + std::array<uint32, MAX_ATTACK> m_attackTimer; // stat system void HandleStatFlatModifier(UnitMods unitMod, UnitModifierFlatType modifierType, float amount, bool apply); @@ -1746,8 +1746,8 @@ class TC_GAME_API Unit : public WorldObject void FollowerRemoved(AbstractFollower* f) { m_followingMe.erase(f); } void RemoveAllFollowers(); - MotionMaster* GetMotionMaster() { return i_motionMaster; } - MotionMaster const* GetMotionMaster() const { return i_motionMaster; } + MotionMaster* GetMotionMaster() { return i_motionMaster.get(); } + MotionMaster const* GetMotionMaster() const { return i_motionMaster.get(); } virtual MovementGeneratorType GetDefaultMovementType() const; bool IsStopped() const { return !(HasUnitState(UNIT_STATE_MOVING)); } @@ -1811,7 +1811,7 @@ class TC_GAME_API Unit : public WorldObject ObjectGuid LastCharmerGUID; bool CreateVehicleKit(uint32 id, uint32 creatureEntry, bool loading = false); void RemoveVehicleKit(bool onRemoveFromWorld = false); - Vehicle* GetVehicleKit() const { return m_vehicleKit; } + Vehicle* GetVehicleKit() const { return m_vehicleKit.get(); } Vehicle* GetVehicle() const { return m_vehicle; } void SetVehicle(Vehicle* vehicle) { m_vehicle = vehicle; } bool IsOnVehicle(Unit const* vehicle) const; @@ -1868,7 +1868,7 @@ class TC_GAME_API Unit : public WorldObject bool CanInstantCast() const { return _instantCast; } // Movement info - Movement::MoveSpline * movespline; + std::unique_ptr<Movement::MoveSpline> movespline; int32 GetHighestExclusiveSameEffectSpellGroupValue(AuraEffect const* aurEff, AuraType auraType, bool checkMiscValue = false, int32 miscValue = 0) const; bool IsHighestExclusiveAura(Aura const* aura, bool removeOtherAuraApplications = false); @@ -1942,9 +1942,9 @@ class TC_GAME_API Unit : public WorldObject bool m_ControlledByPlayer; - float m_createStats[MAX_STATS]; - float m_floatStatPosBuff[MAX_STATS]; - float m_floatStatNegBuff[MAX_STATS]; + std::array<float, MAX_STATS> m_createStats; + std::array<float, MAX_STATS> m_floatStatPosBuff; + std::array<float, MAX_STATS> m_floatStatNegBuff; AttackerSet m_attackers; Unit* m_attacking; @@ -1965,7 +1965,7 @@ class TC_GAME_API Unit : public WorldObject uint32 m_transformSpell; - Spell* m_currentSpells[CURRENT_MAX_SPELL]; + std::array<Spell*, CURRENT_MAX_SPELL> m_currentSpells; AuraMap m_ownedAuras; AuraApplicationMap m_appliedAuras; @@ -1973,7 +1973,7 @@ class TC_GAME_API Unit : public WorldObject AuraMap::iterator m_auraUpdateIterator; uint32 m_removedAurasCount; - AuraEffectList m_modAuras[TOTAL_AURAS]; + std::array<AuraEffectList, TOTAL_AURAS> m_modAuras; AuraList m_scAuras; // cast singlecast auras AuraApplicationList m_interruptableAuras; // auras which have interrupt mask applied on unit AuraStateAurasMap m_auraStateAuras; // Used for improve performance of aura state checks on aura apply/remove @@ -1988,22 +1988,22 @@ class TC_GAME_API Unit : public WorldObject VisibleAuraContainer m_visibleAuras; Trinity::Containers::FlatSet<AuraApplication*, VisibleAuraSlotCompare> m_visibleAurasToUpdate; - float m_speed_rate[MAX_MOVE_TYPE]; + std::array<float, MAX_MOVE_TYPE> m_speed_rate; Unit* m_unitMovedByMe; // only ever set for players, and only for direct client control Player* m_playerMovingMe; // only set for direct client control (possess effects, vehicles and similar) Unit* m_charmer; // Unit that is charming ME Unit* m_charmed; // Unit that is being charmed BY ME - CharmInfo* m_charmInfo; + std::unique_ptr<CharmInfo> m_charmInfo; SharedVisionList m_sharedVision; - MotionMaster* i_motionMaster; + std::unique_ptr<MotionMaster> i_motionMaster; - uint32 m_reactiveTimer[MAX_REACTIVE]; + std::array<uint32, MAX_REACTIVE> m_reactiveTimer; uint32 m_regenTimer; Vehicle* m_vehicle; - Vehicle* m_vehicleKit; + std::unique_ptr<Vehicle> m_vehicleKit; uint32 m_unitTypeMask; LiquidTypeEntry const* _lastLiquid; @@ -2086,7 +2086,7 @@ class TC_GAME_API Unit : public WorldObject uint16 _movementAnimKitId; uint16 _meleeAnimKitId; - SpellHistory* _spellHistory; + std::unique_ptr<SpellHistory> _spellHistory; std::unique_ptr<MovementForces> _movementForces; PositionUpdateInfo _positionUpdateInfo; diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 47c9d1e0d64..ebeb508802c 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -29,14 +29,10 @@ class VehicleJoinEvent; class TC_GAME_API Vehicle : public TransportBase { - protected: - friend bool Unit::CreateVehicleKit(uint32 id, uint32 creatureEntry, bool); + public: Vehicle(Unit* unit, VehicleEntry const* vehInfo, uint32 creatureEntry); - - friend void Unit::RemoveVehicleKit(bool); ~Vehicle(); - public: Vehicle(Vehicle const& right) = delete; Vehicle(Vehicle&& right) = delete; Vehicle& operator=(Vehicle const& right) = delete; |