From 1f189dfa804a05177f99dda1044898eb63fdcb3f Mon Sep 17 00:00:00 2001 From: MegaMech Date: Thu, 23 Jan 2025 11:22:07 -0700 Subject: Game.cpp and World.cpp Cleanup (#159) * Remove CProperties and delete dup Properties from World.h * Improvement * Fix compile * Cleanup * Document gRaceState * wip cleanup * compile * Impl PlayerBombKart * Rename CourseManager_ to CM_ * Finish renames m_ to CM_ * cleanup * Remove extra printf --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> --- src/engine/courses/BlockFort.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/engine/courses/BlockFort.cpp') diff --git a/src/engine/courses/BlockFort.cpp b/src/engine/courses/BlockFort.cpp index 61eb3c0b1..136ffeef5 100644 --- a/src/engine/courses/BlockFort.cpp +++ b/src/engine/courses/BlockFort.cpp @@ -120,21 +120,19 @@ void BlockFort::Load() { void BlockFort::LoadTextures() { } -void BlockFort::SpawnActors() { +void BlockFort::BeginPlay() { spawn_all_item_boxes((ActorSpawnData*)LOAD_ASSET_RAW(d_course_block_fort_item_box_spawns)); -} -void BlockFort::SpawnVehicles() { if (gModeSelection == VERSUS) { Vec3f pos = {0, 0, 0}; - gWorldInstance.AddBombKart(pos, &D_80164550[0][20], 20, 0, 1.0f); - gWorldInstance.AddBombKart(pos, &D_80164550[0][40], 40, 0, 1.0f); - gWorldInstance.AddBombKart(pos, &D_80164550[0][60], 60, 0, 1.0f); - gWorldInstance.AddBombKart(pos, &D_80164550[0][80], 80, 0, 1.0f); - gWorldInstance.AddBombKart(pos, &D_80164550[0][100], 100, 0, 1.0f); - gWorldInstance.AddBombKart(pos, &D_80164550[0][120], 120, 0, 1.0f); - gWorldInstance.AddBombKart(pos, &D_80164550[0][140], 140, 0, 1.0f); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][20], 20, 0, 1.0f)); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][40], 40, 0, 1.0f)); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][60], 60, 0, 1.0f)); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][80], 80, 0, 1.0f)); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][100], 100, 0, 1.0f)); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][120], 120, 0, 1.0f)); + gWorldInstance.AddObject(new OBombKart(pos, &D_80164550[0][140], 140, 0, 1.0f)); } } -- cgit v1.2.3