diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-01-23 11:22:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-23 11:22:07 -0700 |
| commit | 1f189dfa804a05177f99dda1044898eb63fdcb3f (patch) | |
| tree | 598e0a6c26a5554afd1fcbcd801079fd1df090d3 /src/code_8006E9C0.c | |
| parent | 24ecfc3db43bfa606f41c42ef8778f96b5047c6b (diff) | |
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>
Diffstat (limited to 'src/code_8006E9C0.c')
| -rw-r--r-- | src/code_8006E9C0.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index dba0d21a7..e5cc43887 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -29,7 +29,6 @@ #include <assets/boo_frames.h> #include "port/Game.h" -#include "engine/Engine.h" #include "engine/courses/Course.h" void init_hud(void) { @@ -164,11 +163,11 @@ void init_item_window(s32 objectIndex) { } void func_8006EEE8(s32 courseId) { - D_8018D240 = (uintptr_t) CourseManager_GetProps()->MinimapTexture; + D_8018D240 = (uintptr_t) CM_GetProps()->MinimapTexture; // This is incredibly dumb. MinimapDimensions ought to be something more like // `u16 MinimapDimensions[][2]` but that doesn't match for some insane reason - gMinimapWidth = CourseManager_GetProps()->MinimapDimensions.X; // MinimapDimensions[courseId * 2]; - gMinimapHeight = CourseManager_GetProps()->MinimapDimensions.Z; // MinimapDimensions[courseId * 2 + 1]; + gMinimapWidth = CM_GetProps()->MinimapDimensions.X; // MinimapDimensions[courseId * 2]; + gMinimapHeight = CM_GetProps()->MinimapDimensions.Z; // MinimapDimensions[courseId * 2 + 1]; } void func_8006EF60(void) { @@ -182,7 +181,7 @@ void func_8006EF60(void) { // clang-format off // God forgive me for my sins... - // huh = 0x14; if (0) {} for (i = 0; i < huh; i++) {D_8018D248[i] = CourseManager_GetProps()->MinimapTexture; wut += ResourceGetTexSizeByName(CourseManager_GetProps()->MinimapTexture); } + // huh = 0x14; if (0) {} for (i = 0; i < huh; i++) {D_8018D248[i] = CM_GetProps()->MinimapTexture; wut += ResourceGetTexSizeByName(CM_GetProps()->MinimapTexture); } // clang-format on } @@ -201,7 +200,7 @@ void func_8006F008(void) { if (GetCourse() != GetPodiumCeremony()) { func_8006EEE8((s32) gCurrentCourseId); } - CourseManager_MinimapSettings(); + CM_MinimapSettings(); switch (gCurrentCourseId) { case COURSE_MARIO_RACEWAY: @@ -625,8 +624,6 @@ void init_object_list_index(void) { find_unused_obj_index(&indexObjectList4[loopIndex]); } - CourseManager_SpawnBombKarts(); - // for (loopIndex = 0; loopIndex < NUM_BOMB_KARTS_VERSUS; loopIndex++) { // find_unused_obj_index(&gIndexObjectBombKart[loopIndex]); // } @@ -707,7 +704,7 @@ void func_8007055C(void) { s32 var_s0; s32 var_s4; - CourseManager_InitClouds(); + CM_InitClouds(); switch (gCurrentCourseId) { case COURSE_MARIO_RACEWAY: @@ -777,7 +774,7 @@ void init_course_object(void) { s32 objectId; s32 i; - CourseManager_InitCourseObjects(); + CM_InitCourseObjects(); // switch (gCurrentCourseId) { // case COURSE_MARIO_RACEWAY: |