From 8ede5b87ca6133a61c5e6c8ee73c0eb9f00e3c22 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Tue, 4 Jul 2023 22:38:35 -0700 Subject: [PATCH] Fix compilation error; add final specifiers --- dGame/dComponents/DestroyableComponent.h | 2 +- dGame/dComponents/DonationVendorComponent.h | 2 +- dGame/dComponents/GateRushComponent.h | 2 +- dGame/dComponents/HavokVehiclePhysicsComponent.h | 2 +- dGame/dComponents/InventoryComponent.h | 2 +- dGame/dComponents/ItemComponent.h | 2 +- dGame/dEntity/Entity.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dGame/dComponents/DestroyableComponent.h b/dGame/dComponents/DestroyableComponent.h index 011ab795..8c4d1127 100644 --- a/dGame/dComponents/DestroyableComponent.h +++ b/dGame/dComponents/DestroyableComponent.h @@ -17,7 +17,7 @@ enum class eStateChangeType : uint32_t; * Represents the stats of an entity, for example its health, imagination and armor. Also handles factions, which * indicate which enemies this entity has. */ -class DestroyableComponent : public Component { +class DestroyableComponent final : public Component { public: inline static const eReplicaComponentType ComponentType = eReplicaComponentType::DESTROYABLE; diff --git a/dGame/dComponents/DonationVendorComponent.h b/dGame/dComponents/DonationVendorComponent.h index df6d3562..22832f14 100644 --- a/dGame/dComponents/DonationVendorComponent.h +++ b/dGame/dComponents/DonationVendorComponent.h @@ -6,7 +6,7 @@ class Entity; -class DonationVendorComponent : public VendorComponent { +class DonationVendorComponent final : public VendorComponent { public: inline static const eReplicaComponentType ComponentType = eReplicaComponentType::DONATION_VENDOR; DonationVendorComponent(Entity* parent); diff --git a/dGame/dComponents/GateRushComponent.h b/dGame/dComponents/GateRushComponent.h index 8680e2d7..baf96765 100644 --- a/dGame/dComponents/GateRushComponent.h +++ b/dGame/dComponents/GateRushComponent.h @@ -6,7 +6,7 @@ class Entity; -class GateRushComponent : public RacingControlComponent { +class GateRushComponent final : public RacingControlComponent { public: inline static const eReplicaComponentType ComponentType = eReplicaComponentType::GATE_RUSH_CONTROL; GateRushComponent(Entity* parent, int32_t componentId); diff --git a/dGame/dComponents/HavokVehiclePhysicsComponent.h b/dGame/dComponents/HavokVehiclePhysicsComponent.h index fd730f17..dfaa10b0 100644 --- a/dGame/dComponents/HavokVehiclePhysicsComponent.h +++ b/dGame/dComponents/HavokVehiclePhysicsComponent.h @@ -26,7 +26,7 @@ struct RemoteInputInfo { /** * Physics component for vehicles. */ -class HavokVehiclePhysicsComponent : public Component { +class HavokVehiclePhysicsComponent final : public Component { public: inline static const eReplicaComponentType ComponentType = eReplicaComponentType::HAVOK_VEHICLE_PHYSICS; diff --git a/dGame/dComponents/InventoryComponent.h b/dGame/dComponents/InventoryComponent.h index fc4b4921..864f07a4 100644 --- a/dGame/dComponents/InventoryComponent.h +++ b/dGame/dComponents/InventoryComponent.h @@ -35,7 +35,7 @@ enum class eItemType : int32_t; * of different types, each type representing a different group of items, see `eInventoryType` for a list of * inventories. */ -class InventoryComponent : public Component +class InventoryComponent final : public Component { public: inline static const eReplicaComponentType ComponentType = eReplicaComponentType::INVENTORY; diff --git a/dGame/dComponents/ItemComponent.h b/dGame/dComponents/ItemComponent.h index c991d5b5..75c36897 100644 --- a/dGame/dComponents/ItemComponent.h +++ b/dGame/dComponents/ItemComponent.h @@ -12,7 +12,7 @@ class Entity; enum class eUgcModerationStatus : uint32_t; -class ItemComponent : public Component { +class ItemComponent final : public Component { public: static const eReplicaComponentType ComponentType = eReplicaComponentType::ITEM; diff --git a/dGame/dEntity/Entity.h b/dGame/dEntity/Entity.h index 97217c69..2aae5f87 100644 --- a/dGame/dEntity/Entity.h +++ b/dGame/dEntity/Entity.h @@ -379,7 +379,7 @@ protected: std::vector m_TargetsInPhantom; static const std::vector m_ComponentWhitelists; - static const std::array m_ComponentOrder; + static const std::array m_ComponentOrder; }; #include "Entity.tcc"