From 517a59fbf49a4d2bb59aefb10f2acfcdd17ff75e Mon Sep 17 00:00:00 2001
From: MegaMech <inkstudios1@hotmail.com>
Date: Fri, 13 Dec 2024 15:18:39 -0700
Subject: Impl trophy

---
 src/engine/World.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/engine/World.h')

diff --git a/src/engine/World.h b/src/engine/World.h
index 2ae4462f4..3b48284e8 100644
--- a/src/engine/World.h
+++ b/src/engine/World.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libultraship.h>
-#include "objects/GameObject.h"
+#include "objects/Object.h"
 #include "Cup.h"
 #include "vehicles/Vehicle.h"
 #include "vehicles/Train.h"
@@ -14,6 +14,7 @@
 #include "objects/Seagull.h"
 #include <memory>
 #include "Actor.h"
+#include "particles/ParticleEmitter.h"
 
 extern "C" {
 #include "camera.h"
@@ -21,7 +22,7 @@ extern "C" {
 #include "engine/Engine.h"
 };
 
-class GameObject;
+class OObject;
 class Cup; // <-- Forward declaration
 class Course;
 class AVehicle;
@@ -95,11 +96,11 @@ public:
     AActor* ConvertActorToAActor(Actor* actor);
     Actor* ConvertAActorToActor(AActor* actor);
 
-    GameObject* AddObject(GameObject* object);
+    OObject* AddObject(OObject* object);
 
     CProperties* GetCourseProps();
     void TickObjects();
-    void DrawObjects(Camera *camera);
+    void DrawObjects(s32 cameraId);
     void ExpiredObjects();
     void DestroyObjects();
     Object *GetObjectByIndex(size_t);
@@ -131,7 +132,8 @@ public:
     size_t CupIndex = 1;
 
     std::vector<AActor*> Actors;
-    std::vector<GameObject*> Objects;
+    std::vector<OObject*> Objects;
+    std::vector<ParticleEmitter*> Emitters;
 
     /** Actors */
     void AddBoat(f32 speed, uint32_t waypoint);
-- 
cgit v1.2.3