From a0c78b9a85987d5772ea46cc1eee1b98e5a1b417 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 21 Aug 2024 06:28:25 -0500 Subject: [PATCH] Fix naming conflict with olc::Decal and olc::Sprite (Makes gcc happy) --- src/SpecialRenderable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SpecialRenderable.h b/src/SpecialRenderable.h index c99b529..e9079f5 100644 --- a/src/SpecialRenderable.h +++ b/src/SpecialRenderable.h @@ -51,7 +51,7 @@ public: void Initialize(const std::string&imgName,const Pixel overrideCol,const Pixel matrixCol); void Update(const float fElapsedTime); const Renderable&Get()const; - Decal*Decal()const; - Sprite*Sprite()const; + ::Decal*Decal()const; + ::Sprite*Sprite()const; void ChangeMatrixColor(const Pixel newMatrixCol); }; \ No newline at end of file