From e418784c51b6ac88700261c075d129d4e77bd61c Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 12 Aug 2022 02:18:28 -0700 Subject: [PATCH] Fix IWeaponRenderer and link --- include/Kyoto/Particles/CParticleGen.hpp | 2 +- include/Weapons/IWeaponRenderer.hpp | 6 ++++-- obj_files.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/Kyoto/Particles/CParticleGen.hpp b/include/Kyoto/Particles/CParticleGen.hpp index b36c7c6c..4059d3e1 100644 --- a/include/Kyoto/Particles/CParticleGen.hpp +++ b/include/Kyoto/Particles/CParticleGen.hpp @@ -3,8 +3,8 @@ #include "Kyoto/Math/CTransform4f.hpp" #include "Kyoto/Math/CVector3f.hpp" -#include "Kyoto/Math/CColor.hpp" #include "Kyoto/Math/CAABox.hpp" +#include "Kyoto/Graphics/CColor.hpp" #include "Kyoto/Graphics/CLight.hpp" class CWarp; diff --git a/include/Weapons/IWeaponRenderer.hpp b/include/Weapons/IWeaponRenderer.hpp index faecc2fc..57151727 100644 --- a/include/Weapons/IWeaponRenderer.hpp +++ b/include/Weapons/IWeaponRenderer.hpp @@ -6,16 +6,18 @@ class IWeaponRenderer { public: - virtual ~IWeaponRenderer() {}; + virtual ~IWeaponRenderer()=0; virtual void AddParticleGen(const CParticleGen& gen) = 0; static void SetRenderer(IWeaponRenderer* renderer) { sWeaponRenderer = renderer; } private: static IWeaponRenderer* sWeaponRenderer; }; +inline IWeaponRenderer::~IWeaponRenderer() {} + class CDefaultWeaponRenderer : public IWeaponRenderer { public: - virtual ~CDefaultWeaponRenderer() {}; + ~CDefaultWeaponRenderer() {} void AddParticleGen(const CParticleGen& gen) { gen.Render(); } }; diff --git a/obj_files.mk b/obj_files.mk index 8c4daf44..831a106e 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -380,7 +380,7 @@ WEAPONS :=\ $(BUILD_DIR)/asm/Weapons/CProjectileWeapon.o\ $(BUILD_DIR)/asm/Weapons/CProjectileWeaponDataFactory.o\ $(BUILD_DIR)/asm/Weapons/CCollisionResponseData.o\ - $(BUILD_DIR)/asm/Weapons/IWeaponRenderer.o\ + $(BUILD_DIR)/src/Weapons/IWeaponRenderer.o\ $(BUILD_DIR)/asm/Weapons/CDecalDataFactory.o\ $(BUILD_DIR)/asm/Weapons/CDecal.o\ $(BUILD_DIR)/asm/Weapons/CWeaponDescription.o\