Reimpl Lakitu

1 files changed, 6 insertions, 3 deletions

diff --git a/src/engine/World.h b/src/engine/World.h
index 2abb06fe0..403a708c2 100644
--- a/src/engine/World.h
+++ b/src/engine/World.h
@@ -12,7 +12,9 @@
 #include "objects/Thwomp.h"
 #include "objects/Penguin.h"
 #include "objects/Seagull.h"
+#include "objects/Lakitu.h"
 #include <memory>
+#include <unordered_map>
 #include "Actor.h"
 #include "particles/ParticleEmitter.h"
 
@@ -89,6 +91,7 @@ class ACar;
 class TrainCrossing;
 class OThwomp;
 class OSeagull;
+class OLakitu;
 
 class World {
 
@@ -150,7 +153,6 @@ public:
     AActor* GetActor(size_t index);
 
     void TickActors();
-    void RemoveExpiredActors();
     AActor* ConvertActorToAActor(Actor* actor);
     Actor* ConvertAActorToActor(AActor* actor);
 
@@ -158,9 +160,8 @@ public:
 
     CProperties* GetCourseProps();
     void TickObjects();
+    void TickObjects60fps();
     void DrawObjects(s32 cameraId);
-    void ExpiredObjects();
-    void DestroyObjects();
     Object *GetObjectByIndex(size_t);
 
     void AddCup(Cup*);
@@ -193,6 +194,8 @@ public:
     std::vector<OObject*> Objects;
     std::vector<ParticleEmitter*> Emitters;
 
+    std::unordered_map<s32, OLakitu*> Lakitus;
+
     /** Actors */
     void AddBoat(f32 speed, uint32_t waypoint);
     void AddTrain(ATrain::TenderStatus tender, size_t numCarriages, f32 speed, uint32_t waypoint);