Trophy, Object impl, and cleanup

5 files changed, 36 insertions, 25 deletions

diff --git a/src/engine/objects/GameObject.cpp b/src/engine/objects/GameObject.cpp
deleted file mode 100644
index c7be32769..000000000
--- a/src/engine/objects/GameObject.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <libultraship.h>
-#include "GameObject.h"
-
-#include "World.h"
-
-extern "C" {
-    #include "camera.h"
-}
-
-
-    //GameActor()
-
-GameObject::GameObject() {}
-
-    // Virtual functions to be overridden by derived classes
-void GameObject::Tick() {  }
-void GameObject::Draw(Camera* camera) { }
-void GameObject::Collision() {}
-void GameObject::Expire() { }
-void GameObject::Destroy() { }
diff --git a/src/engine/objects/Object.cpp b/src/engine/objects/Object.cpp
new file mode 100644
index 000000000..74143a923
--- /dev/null
+++ b/src/engine/objects/Object.cpp
@@ -0,0 +1,20 @@
+#include <libultraship.h>
+#include "Object.h"
+
+#include "World.h"
+
+extern "C" {
+    #include "camera.h"
+}
+
+
+    //GameActor()
+
+OObject::OObject() {}
+
+    // Virtual functions to be overridden by derived classes
+void OObject::Tick() {  }
+void OObject::Draw(s32 cameraId) { }
+void OObject::Collision() {}
+void OObject::Expire() { }
+void OObject::Destroy() { }
diff --git a/src/engine/objects/GameObject.h b/src/engine/objects/Object.h
index 19d5301cd..c41cfae6d 100644
--- a/src/engine/objects/GameObject.h
+++ b/src/engine/objects/Object.h
@@ -7,17 +7,17 @@ extern "C" {
     #include "objects.h"
 }
 
-class GameObject {
+class OObject {
 public:
     uint8_t uuid[16];
     Object o;
 
-    virtual ~GameObject() = default;
+    virtual ~OObject() = default;
 
-    explicit GameObject();
+    explicit OObject();
 
     virtual void Tick();
-    virtual void Draw(Camera* camera);
+    virtual void Draw(s32 cameraId);
     virtual void Collision();
     virtual void Expire();
     virtual void Destroy();
diff --git a/src/engine/objects/Thwomp.h b/src/engine/objects/Thwomp.h
index 517d2972d..f64318e4d 100644
--- a/src/engine/objects/Thwomp.h
+++ b/src/engine/objects/Thwomp.h
@@ -18,7 +18,7 @@ extern "C" {
 //! @todo make adjustable properties for squishSize and boundingBoxSize
 
 /**
- * Thwomp GameObject
+ * Thwomp OObject
  * 
  * The game automatically places the actor on the ground so you do not need to provide a Y coordinate value.
  * 
diff --git a/src/engine/objects/Trophy.h b/src/engine/objects/Trophy.h
index 76834d77e..d73e04929 100644
--- a/src/engine/objects/Trophy.h
+++ b/src/engine/objects/Trophy.h
@@ -15,6 +15,17 @@ extern "C" {
 #include "some_data.h"
 }
 
+//! @todo move this like World.h or something
+struct FVector {
+    float x, y, z;
+
+    FVector& operator=(const FVector& other) {
+        x = other.x;
+        y = other.y;
+        z = other.z;
+        return *this;
+    }
+};
 
 class OTrophy : public OObject {
 public: