Removed the class friends from the object base

mmatyas · Apr 14, 2024 · 2f85d0e · 2f85d0e
1 parent f352cf8
commit 2f85d0e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 25 deletions.
diff --git a/src/common/ObjectBase.cpp b/src/common/ObjectBase.cpp
@@ -2,6 +2,7 @@
 
 #include "GlobalConstants.h"
 #include "map.h"
+#include "gfx/gfxSprite.h"
 
 extern CMap* g_map;
 
@@ -78,3 +79,8 @@ std::array<IO_Block*, 4> CObject::GetCollisionBlocks() const
 
     return blocks;
 }
+
+bool CObject::GetWrap() const
+{
+    return spr ? spr->GetWrap() : true;
+}
diff --git a/src/common/ObjectBase.h b/src/common/ObjectBase.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "gfx/gfxSprite.h"
-
 #include <array>
 
+class gfxSprite;
 class CPlayer;
 class IO_Block;
 class IO_MovingObject;
@@ -61,44 +60,29 @@ class CObject {
         fy = static_cast<float>(iy);
     }
 
-    int iNetworkID;
     short ix, iy;
+    short iw = 0, ih = 0;
+    float velx = 0.f, vely = 0.f;
+    int iNetworkID;
 
     short collisionWidth;
     short collisionHeight;
     short collisionOffsetX = 0;
     short collisionOffsetY = 0;
 
-    short GetState() const {
-        return state;
-    }
-    bool isDead() const {
-        return dead;
-    }
-    bool GetWrap() const {
-        return spr ? spr->GetWrap() : true;
-    }
+    short GetState() const { return state; }
+    bool isDead() const { return dead; }
+    bool GetWrap() const;
 
     /// Returns the blocks touching each of the four corners,
     std::array<IO_Block*, 4> GetCollisionBlocks() const;
 
 protected:
     ObjectType objectType = object_none;
 
-    short iw = 0, ih = 0;
     float fx = 0.f, fy = 0.f;
-    float velx = 0.f, vely = 0.f;
 
     gfxSprite* spr = nullptr;
     short state = 0;
     bool dead = false;
-
-    friend class CObjectContainer;
-    friend class CPlayer;
-    friend void RunGame();
-    friend void shakeScreen();
-    friend void handleP2ObjCollisions();
-    friend class CO_Shell;
-    friend class B_BreakableBlock;
-    friend class B_WeaponBreakableBlock;
 };
diff --git a/src/smw/ObjectContainer.cpp b/src/smw/ObjectContainer.cpp
@@ -29,7 +29,7 @@ void CObjectContainer::clean()
 void CObjectContainer::cleanDeadObjects()
 {
     auto erase_from = std::remove_if(m_list.begin(), m_list.end(),
-        [](const std::unique_ptr<CObject>& obj) { return obj->dead; });
+        [](const std::unique_ptr<CObject>& obj) { return obj->isDead(); });
     m_list.erase(erase_from, m_list.end());
 }
 

diff --git a/src/smw/objects/moving/MO_CarriedObject.h b/src/smw/objects/moving/MO_CarriedObject.h
@@ -21,7 +21,7 @@ class MO_CarriedObject : public IO_MovingObject {
     virtual void Drop();
     virtual void Kick();
 
-    bool HasOwner() { return owner != NULL; }
+    bool HasOwner() { return owner != nullptr; }
     bool IsCarriedByKuriboShoe() { return fCarriedByKuriboShoe; }
 
 protected:

diff --git a/src/smw/objects/moving/Powerup.cpp b/src/smw/objects/moving/Powerup.cpp
@@ -1,6 +1,7 @@
 #include "Powerup.h"
 
 #include "GlobalConstants.h"
+#include "gfx/gfxSprite.h"
 
 //------------------------------------------------------------------------------
 // class powerup