Refactors (#114)

* Update Engine.cpp

* fix

* Add Actors

* Refactor

* Update Game.cpp

* Refactors as per review

src/engine/courses/BansheeBoardwalk.cpp

@@ -109,8 +109,6 @@ void BansheeBoardwalk::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_banshee_boardwalk_item_box_spawns));
 }
 
-void BansheeBoardwalk::Init() {  }
-
 // Likely sets minimap boundaries
 void BansheeBoardwalk::MinimapSettings() {
     D_80165880 = dma_textures((const char*)gTextureGhosts, 0x4CC2, 0xD980);

src/engine/courses/BansheeBoardwalk.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/BigDonut.cpp

@@ -103,8 +103,6 @@ void BigDonut::LoadTextures() {
 
 void BigDonut::SpawnActors() {}
 
-void BigDonut::Init() {  }
-
 // Likely sets minimap boundaries
 void BigDonut::MinimapSettings() {
     D_8018D2A0 = 0.0257f;

src/engine/courses/BigDonut.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/BlockFort.cpp

@@ -106,8 +106,6 @@ void BlockFort::LoadTextures() {
 
 void BlockFort::SpawnActors() {}
 
-void BlockFort::Init() {  }
-
 // Likely sets minimap boundaries
 void BlockFort::MinimapSettings() {
     D_8018D2A0 = 0.0335f;

src/engine/courses/BlockFort.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/BowsersCastle.cpp

@@ -111,8 +111,6 @@ void BowsersCastle::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_bowsers_castle_item_box_spawns));
 }
 
-void BowsersCastle::Init() {  }
-
 // Likely sets minimap boundaries
 void BowsersCastle::MinimapSettings() {
     D_8018D2C0[0] = 265;

src/engine/courses/BowsersCastle.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/ChocoMountain.cpp

@@ -110,8 +110,6 @@ void ChocoMountain::SpawnActors() {
     spawn_falling_rocks((struct ActorSpawnData*)LOAD_ASSET_RAW((const char*)d_course_choco_mountain_falling_rock_spawns));
 }
 
-void ChocoMountain::Init() {  }
-
 // Likely sets minimap boundaries
 void ChocoMountain::MinimapSettings() {
     D_8018D2A0 = 0.022f;

src/engine/courses/ChocoMountain.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/Course.cpp

@@ -125,8 +125,6 @@ void Course::SpawnActors() {
 
 }
 
-void Course::Init() {
-}
 void Course::InitClouds() {
     if (this->Props.Clouds) {
         init_clouds(this->Props.Clouds);

src/engine/courses/Course.h

@@ -92,7 +92,6 @@ public:
     virtual void Load(Vtx* vtx, Gfx *gfx); // Load custom course
     virtual void LoadTextures();
     virtual void SpawnActors();
-    virtual void Init();
     virtual void InitClouds();
     virtual void UpdateClouds(s32, Camera*);
     virtual void SomeCollisionThing(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, f32* arg7);

src/engine/courses/DKJungle.cpp

@@ -117,8 +117,6 @@ void DKJungle::SpawnActors() {
     func_80298D10();
 }
 
-void DKJungle::Init() {  }
-
 // Likely sets minimap boundaries
 void DKJungle::MinimapSettings() {
     D_8018D2A0 = 0.0155f;

src/engine/courses/DKJungle.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/DoubleDeck.cpp

@@ -106,8 +106,6 @@ void DoubleDeck::LoadTextures() {
 
 void DoubleDeck::SpawnActors() {}
 
-void DoubleDeck::Init() {  }
-
 // Likely sets minimap boundaries
 void DoubleDeck::MinimapSettings() {
     D_8018D2A0 = 0.0285f;

src/engine/courses/DoubleDeck.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/FrappeSnowland.cpp

@@ -113,7 +113,6 @@ void FrappeSnowland::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_frappe_snowland_item_box_spawns));
 }
 
-void FrappeSnowland::Init() {  }
 void FrappeSnowland::InitClouds() {
     s32 var_s0;
     s32 var_s4;

src/engine/courses/FrappeSnowland.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void InitClouds() override;
     virtual void UpdateClouds(s32 sp1C, Camera* camera) override;
     virtual void MinimapSettings() override;

src/engine/courses/KalimariDesert.cpp

@@ -148,8 +148,6 @@ void KalimariDesert::SpawnActors() {
     rrxing->crossingTrigger = crossing1;
 }
 
-void KalimariDesert::Init() {}
-
 // Likely sets minimap boundaries
 void KalimariDesert::MinimapSettings() {
     D_8018D2C0[0] = 263;

src/engine/courses/KalimariDesert.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void SomeSounds() override;

src/engine/courses/KoopaTroopaBeach.cpp

@@ -112,8 +112,6 @@ void KoopaTroopaBeach::SpawnActors() {
     spawn_palm_trees((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_koopa_troopa_beach_tree_spawn));
 }
 
-void KoopaTroopaBeach::Init() {}
-
 // Likely sets minimap boundaries
 void KoopaTroopaBeach::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust3, 0x3C8U, 0x1000));

src/engine/courses/KoopaTroopaBeach.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void UpdateCourseObjects() override;

src/engine/courses/LuigiRaceway.cpp

@@ -113,8 +113,6 @@ void LuigiRaceway::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_luigi_raceway_item_box_spawns));
 }
 
-void LuigiRaceway::Init() {}
-
 // Likely sets minimap boundaries
 void LuigiRaceway::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust2, 0x4F4U, 0xC00));

src/engine/courses/LuigiRaceway.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void UpdateCourseObjects() override;

src/engine/courses/MarioRaceway.cpp

@@ -132,8 +132,6 @@ void MarioRaceway::SpawnActors() {
     actor->flags |= 0x4000;
 }
 
-void MarioRaceway::Init() {}
-
 // Likely sets minimap boundaries
 void MarioRaceway::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust5, 0x443, 0x1000));

src/engine/courses/MarioRaceway.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void SomeSounds() override;

src/engine/courses/MooMooFarm.cpp

@@ -125,8 +125,6 @@ void MooMooFarm::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_moo_moo_farm_item_box_spawns));
 }
 
-void MooMooFarm::Init() {}
-
 // Likely sets minimap boundaries
 void MooMooFarm::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust0, 0x479, 0xC00));

src/engine/courses/MooMooFarm.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void UpdateCourseObjects() override;

src/engine/courses/PodiumCeremony.cpp

@@ -105,8 +105,6 @@ void PodiumCeremony::SpawnActors() {
     spawn_piranha_plants((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_royal_raceway_piranha_plant_spawn));
 }
 
-void PodiumCeremony::Init() {  }
-
 // Likely sets minimap boundaries
 void PodiumCeremony::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust4, 0x3F8, 0x1000));

src/engine/courses/PodiumCeremony.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/RainbowRoad.cpp

@@ -107,8 +107,6 @@ void RainbowRoad::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_rainbow_road_item_box_spawns));
 }
 
-void RainbowRoad::Init() {}
-
 void RainbowRoad::InitClouds() {
     init_stars(this->Props.Clouds);
 }

src/engine/courses/RainbowRoad.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void InitClouds() override;
     virtual void UpdateClouds(s32, Camera*) override;
     virtual void MinimapSettings() override;

src/engine/courses/RoyalRaceway.cpp

@@ -120,8 +120,6 @@ void RoyalRaceway::SpawnActors() {
     spawn_piranha_plants((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_royal_raceway_piranha_plant_spawn));
 }
 
-void RoyalRaceway::Init() {}
-
 // Likely sets minimap boundaries
 void RoyalRaceway::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust4, 0x3F8, 0x1000));

src/engine/courses/RoyalRaceway.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void SomeSounds() override;

src/engine/courses/SherbetLand.cpp

@@ -107,8 +107,6 @@ void SherbetLand::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_sherbet_land_item_box_spawns));
 }
 
-void SherbetLand::Init() {}
-
 // Likely sets minimap boundaries
 void SherbetLand::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust1, 0x485, 0xC00));

src/engine/courses/SherbetLand.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void UpdateCourseObjects() override;

src/engine/courses/Skyscraper.cpp

@@ -106,8 +106,6 @@ void Skyscraper::LoadTextures() {
 
 void Skyscraper::SpawnActors() {}
 
-void Skyscraper::Init() {  }
-
 // Likely sets minimap boundaries
 void Skyscraper::MinimapSettings() {
     D_8018D2A0 = 0.0445f;

src/engine/courses/Skyscraper.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     //virtual void InitClouds() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;

src/engine/courses/TestCourse.cpp

@@ -165,8 +165,6 @@ struct ActorSpawnData rocks[] = {
     rrxing->crossingTrigger = crossing1;
 }
 
-void TestCourse::Init() {}
-
 // Likely sets minimap boundaries
 void TestCourse::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust5, 0x443, 0x1000));

src/engine/courses/TestCourse.h

@@ -27,7 +27,6 @@ public:
     virtual void Load() override;
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void SomeSounds() override;

src/engine/courses/ToadsTurnpike.cpp

@@ -112,7 +112,6 @@ void ToadsTurnpike::SpawnActors() {
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_toads_turnpike_item_box_spawns));
 }
 
-void ToadsTurnpike::Init() {}
 void ToadsTurnpike::InitClouds() {
     init_stars(this->Props.Clouds);
 }

src/engine/courses/ToadsTurnpike.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void InitClouds() override;
     virtual void UpdateClouds(s32, Camera*) override;
     virtual void MinimapSettings() override;

src/engine/courses/WarioStadium.cpp

@@ -107,20 +107,7 @@ void WarioStadium::LoadTextures() {
 }
 
 void WarioStadium::SpawnActors() {
-    Vec3f position;
-    Vec3f velocity = { 0.0f, 0.0f, 0.0f };
-    Vec3s rotation = { 0, 0, 0 };
-
     spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_wario_stadium_item_box_spawns));
-    // vec3f_set(position, -131.0f, 83.0f, 286.0f);
-    // position[0] *= gCourseDirection;
-    // add_actor_to_empty_slot(position, rotation, velocity, ACTOR_WARIO_SIGN);
-    // vec3f_set(position, -2353.0f, 72.0f, -1608.0f);
-    // position[0] *= gCourseDirection;
-    // add_actor_to_empty_slot(position, rotation, velocity, ACTOR_WARIO_SIGN);
-    // vec3f_set(position, -2622.0f, 79.0f, 739.0f);
-    // position[0] *= gCourseDirection;
-    // add_actor_to_empty_slot(position, rotation, velocity, ACTOR_WARIO_SIGN);
 
     Vec3f pos = {-131.0f, 83.0f, 286.0f};
     pos[0] *= gCourseDirection;
@@ -135,7 +122,6 @@ void WarioStadium::SpawnActors() {
     gWorldInstance.AddActor(std::make_unique<AWarioSign>(pos3));
 }
 
-void WarioStadium::Init() {}
 void WarioStadium::InitClouds() {
     init_stars(this->Props.Clouds);
 }

src/engine/courses/WarioStadium.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void InitClouds() override;
     virtual void UpdateClouds(s32,Camera*) override;
     virtual void MinimapSettings() override;

src/engine/courses/YoshiValley.cpp

@@ -117,8 +117,6 @@ void YoshiValley::SpawnActors() {
     add_actor_to_empty_slot(position, rotation, velocity, ACTOR_YOSHI_EGG);
 }
 
-void YoshiValley::Init() {}
-
 // Likely sets minimap boundaries
 void YoshiValley::MinimapSettings() {
     D_8018D220 = reinterpret_cast<uint8_t (*)[1024]>(dma_textures(gTextureExhaust0, 0x479, 0xC00));

src/engine/courses/YoshiValley.h

@@ -26,7 +26,6 @@ public:
 //                  course_texture* textures, const char* displaylists, size_t dlSize);
     virtual void LoadTextures() override;
     virtual void SpawnActors() override;
-    virtual void Init() override;
     virtual void MinimapSettings() override;
     virtual void InitCourseObjects() override;
     virtual void UpdateCourseObjects() override;