diff options
author | Ovahlord <dreadkiller@gmx.de> | 2024-01-22 08:57:06 +0100 |
---|---|---|
committer | funjoker <funjoker109@gmail.com> | 2024-01-29 22:12:42 +0100 |
commit | b7d524a747c8e58e04d09b10f4d36a6fa42218e0 (patch) | |
tree | 4257d8dcafe2731d16d0c6a605c4a1adb3e28234 | |
parent | 461e049b86a860feed658e707510259da323b7f5 (diff) |
Core/Object: use the final keyword for several (World)Object classes that should not get derived from (#29585)
(cherry picked from commit b81fa2e8a3862b8f2ed020f2c52caa93901a530a)
-rw-r--r-- | src/server/game/Entities/AreaTrigger/AreaTrigger.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Conversation/Conversation.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Corpse/Corpse.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/DynamicObject/DynamicObject.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Pet/Pet.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/SceneObject/SceneObject.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Totem/Totem.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Transport/Transport.h | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.h | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.h b/src/server/game/Entities/AreaTrigger/AreaTrigger.h index 89c4745ea7d..d27f6f5fe02 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.h +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.h @@ -39,7 +39,7 @@ namespace Movement class Spline; } -class TC_GAME_API AreaTrigger : public WorldObject, public GridObject<AreaTrigger>, public MapObject +class TC_GAME_API AreaTrigger final : public WorldObject, public GridObject<AreaTrigger>, public MapObject { public: AreaTrigger(); diff --git a/src/server/game/Entities/Conversation/Conversation.h b/src/server/game/Entities/Conversation/Conversation.h index 276b037c925..bfa869154e6 100644 --- a/src/server/game/Entities/Conversation/Conversation.h +++ b/src/server/game/Entities/Conversation/Conversation.h @@ -26,7 +26,7 @@ class Unit; class SpellInfo; enum class ConversationActorType : uint32; -class TC_GAME_API Conversation : public WorldObject, public GridObject<Conversation> +class TC_GAME_API Conversation final : public WorldObject, public GridObject<Conversation> { public: Conversation(); diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index 715666e1e37..18b0057d8b3 100644 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -49,7 +49,7 @@ enum CorpseFlags CORPSE_FLAG_FFA_PVP = 0x40 }; -class TC_GAME_API Corpse : public WorldObject, public GridObject<Corpse> +class TC_GAME_API Corpse final : public WorldObject, public GridObject<Corpse> { public: explicit Corpse(CorpseType type = CORPSE_BONES); diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h index ec81ed24fbb..56358e24106 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.h +++ b/src/server/game/Entities/DynamicObject/DynamicObject.h @@ -33,7 +33,7 @@ enum DynamicObjectType DYNAMIC_OBJECT_FARSIGHT_FOCUS = 0x2 }; -class TC_GAME_API DynamicObject : public WorldObject, public GridObject<DynamicObject>, public MapObject +class TC_GAME_API DynamicObject final : public WorldObject, public GridObject<DynamicObject>, public MapObject { public: DynamicObject(bool isWorldObject); diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 64bd4836999..28098098ff9 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -36,7 +36,7 @@ typedef std::vector<uint32> AutoSpellList; class Player; class PetAura; -class TC_GAME_API Pet : public Guardian +class TC_GAME_API Pet final : public Guardian { public: explicit Pet(Player* owner, PetType type = MAX_PET_TYPE); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index e4ba882e149..73b4f32ea04 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1062,7 +1062,7 @@ enum class ZonePVPTypeOverride : uint32 Combat = 4 }; -class TC_GAME_API Player : public Unit, public GridObject<Player> +class TC_GAME_API Player final : public Unit, public GridObject<Player> { friend class WorldSession; friend class CinematicMgr; diff --git a/src/server/game/Entities/SceneObject/SceneObject.h b/src/server/game/Entities/SceneObject/SceneObject.h index 0e56c85892f..d085b6d7303 100644 --- a/src/server/game/Entities/SceneObject/SceneObject.h +++ b/src/server/game/Entities/SceneObject/SceneObject.h @@ -29,7 +29,7 @@ enum class SceneType : uint32 PetBattle = 1 }; -class TC_GAME_API SceneObject : public WorldObject, public GridObject<SceneObject> +class TC_GAME_API SceneObject final : public WorldObject, public GridObject<SceneObject> { public: SceneObject(); diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h index 72066cc2996..b86e55a6b69 100644 --- a/src/server/game/Entities/Totem/Totem.h +++ b/src/server/game/Entities/Totem/Totem.h @@ -27,7 +27,7 @@ enum TotemType TOTEM_STATUE = 2 // copied straight from MaNGOS, may need more implementation to work }; -class TC_GAME_API Totem : public Minion +class TC_GAME_API Totem final : public Minion { public: Totem(SummonPropertiesEntry const* properties, Unit* owner); diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h index 9a9989990b1..291c2bee98c 100644 --- a/src/server/game/Entities/Transport/Transport.h +++ b/src/server/game/Entities/Transport/Transport.h @@ -26,7 +26,7 @@ struct CreatureData; struct SummonPropertiesEntry; -class TC_GAME_API Transport : public GameObject, public TransportBase +class TC_GAME_API Transport final : public GameObject, public TransportBase { friend Transport* TransportMgr::CreateTransport(uint32, Map*, ObjectGuid::LowType, uint8, uint32, uint32); diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 04859301e9f..a888a8a9007 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -27,7 +27,7 @@ struct VehicleEntry; class Unit; class VehicleJoinEvent; -class TC_GAME_API Vehicle : public TransportBase +class TC_GAME_API Vehicle final : public TransportBase { public: Vehicle(Unit* unit, VehicleEntry const* vehInfo, uint32 creatureEntry); |