From 3edce6535ad53549362b87f1ae30ed66c84c191a Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 3 Sep 2020 13:51:18 +0100 Subject: [PATCH] Collisions? --- The Great Machine/Things.hpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/The Great Machine/Things.hpp b/The Great Machine/Things.hpp index 708d246..a67b77a 100644 --- a/The Great Machine/Things.hpp +++ b/The Great Machine/Things.hpp @@ -91,13 +91,7 @@ namespace EEntity } } -// AABB -class HitBox -{ -public: - int x, y, w, h; -}; - +class HitBox; class Entity { public: @@ -147,10 +141,9 @@ public: olc::vi2d Coords; ETile::Type Type; ETile::State State; - - //olc::vf2d SpriteTextureMask; - //olc::Renderable* SpriteMap; + HitBox* AABBHitBox; + virtual void Update(float fTime); };