diff options
| author | MegaMech <inkstudios1@hotmail.com> | 2024-12-29 21:37:06 -0700 |
|---|---|---|
| committer | MegaMech <inkstudios1@hotmail.com> | 2024-12-29 21:37:06 -0700 |
| commit | 08e4bf37979131e76e617beafb3f5ca6286e5ebb (patch) | |
| tree | 30f3b70de5987a2d4c32e9ab20da0f39bd6f48ae /src/engine/courses/KoopaTroopaBeach.cpp | |
| parent | 64b9dcbb30c5007466c14da7d78d081189810308 (diff) | |
Fix Crab Impl
Diffstat (limited to 'src/engine/courses/KoopaTroopaBeach.cpp')
| -rw-r--r-- | src/engine/courses/KoopaTroopaBeach.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/engine/courses/KoopaTroopaBeach.cpp b/src/engine/courses/KoopaTroopaBeach.cpp index eb4c3c45f..daaba1ad8 100644 --- a/src/engine/courses/KoopaTroopaBeach.cpp +++ b/src/engine/courses/KoopaTroopaBeach.cpp @@ -7,6 +7,7 @@ #include "World.h" #include "engine/actors/AFinishline.h" #include "engine/objects/BombKart.h" +#include "engine/objects/Crab.h" #include "assets/koopa_troopa_beach_data.h" extern "C" { @@ -144,6 +145,19 @@ void KoopaTroopaBeach::SpawnActors() { init_actor_hot_air_balloon_item_box(328.0f * gCourseDirection, 70.0f, 2541.0f); spawn_all_item_boxes((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_koopa_troopa_beach_item_box_spawns)); spawn_palm_trees((struct ActorSpawnData*)LOAD_ASSET_RAW(d_course_koopa_troopa_beach_tree_spawn)); + + if (gGamestate != CREDITS_SEQUENCE) { + gWorldInstance.AddObject(new OCrab(FVector2D(-1809, 625), FVector2D(-1666, 594))); + gWorldInstance.AddObject(new OCrab(FVector2D(-1852, 757), FVector2D(-1620, 740))); + gWorldInstance.AddObject(new OCrab(FVector2D(-1478, 1842), FVector2D(-1453, 1833))); + gWorldInstance.AddObject(new OCrab(FVector2D(-1418, 1967), FVector2D(-1455, 1962))); + gWorldInstance.AddObject(new OCrab(FVector2D(-1472, 2112), FVector2D(-1417, 2100))); + gWorldInstance.AddObject(new OCrab(FVector2D(-1389, 2152), FVector2D(-1335, 2136))); + gWorldInstance.AddObject(new OCrab(FVector2D(218, 693), FVector2D(69, 696))); + gWorldInstance.AddObject(new OCrab(FVector2D(235, 528), FVector2D(24, 501))); + gWorldInstance.AddObject(new OCrab(FVector2D(268, 406), FVector2D(101, 394))); + gWorldInstance.AddObject(new OCrab(FVector2D(223, 318), FVector2D(86, 308))); + } } void KoopaTroopaBeach::SpawnVehicles() { @@ -173,19 +187,6 @@ void KoopaTroopaBeach::InitCourseObjects() { size_t objectId; size_t i; - if (gGamestate != CREDITS_SEQUENCE) { - for (i = 0; i < NUM_CRABS; i++) { - objectId = indexObjectList1[i]; - init_object(objectId, 0); - gObjectList[objectId].pos[0] = gObjectList[objectId].origin_pos[0] = - gCrabSpawns[i].startX * xOrientation; - gObjectList[objectId].unk_01C[0] = gCrabSpawns[i].patrolX * xOrientation; - - gObjectList[objectId].pos[2] = gObjectList[objectId].origin_pos[2] = gCrabSpawns[i].startZ; - gObjectList[objectId].unk_01C[2] = gCrabSpawns[i].patrolZ; - } - } - if (gGamestate == CREDITS_SEQUENCE) { Vec3f pos = {-360.0f, 60.0f, -1300.0f}; for (size_t i = 0; i < NUM_SEAGULLS; i++) { |