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 <[email protected]>

Author: MegaMech

CMakeLists.txt

@@ -385,14 +385,14 @@ if(MSVC)
   if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
       target_compile_options(${PROJECT_NAME} PRIVATE
           $<$<CONFIG:Debug>:
-              /w;
+              /Wall;
               /Od;
               /MTd
           >
           $<$<CONFIG:Release>:
               /Oi;
               /Gy;
-              /W3;
+              /Wall;
               /MT
           >
           /permissive-;

include/actor_types.h

@@ -83,11 +83,11 @@ enum ActorType {
     ACTOR_CAR,
     ACTOR_KIWANO_FRUIT
 };
-size_t m_GetActorSize(void);
-#define ACTOR_LIST_SIZE m_GetActorSize()
+size_t CM_GetActorSize(void);
+#define ACTOR_LIST_SIZE CM_GetActorSize()
 
-struct Actor* m_GetActor(size_t);
-#define GET_ACTOR(index) m_GetActor(index)
+struct Actor* CM_GetActor(size_t);
+#define GET_ACTOR(index) CM_GetActor(index)
 
 // Actor flags
 #define ACTOR_IS_NOT_EXPIRED 0xF // The actor possesses some kind of collision and can be removed

include/defines.h

@@ -195,6 +195,19 @@ enum { COURSE_ONE, COURSE_TWO, COURSE_THREE, COURSE_FOUR };
 #define ENDING 5
 #define CREDITS_SEQUENCE 9
 
+/**
+ * @brief Options for gRaceState
+ */
+#define RACE_INIT 0
+#define RACE_SETUP 1
+#define RACE_STAGING 2
+#define RACE_IN_PROGRESS 3
+#define RACE_CALCULATE_RANKS 4
+#define RACE_FINISHED 5 // End of race and score screen
+#define RACE_UNK 6
+#define RACE_EXIT 7
+
+
 /**
  * @brief Options for gScreenModeSelection and gActiveScreenMode
  */

src/actors/blue_and_red_shells/update.inc.c

@@ -294,9 +294,9 @@ void update_actor_red_blue_shell(struct ShellActor* shell) {
                     func_800C90F4(shell->playerId,
                                   (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x00));
                     if (pad13 == ACTOR_RED_SHELL) {
-                        add_red_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                        add_red_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                     } else {
-                        add_blue_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                        add_blue_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                         func_800C9D80(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x51, 0x01, 0x80, 0x08));
                     }
                 }
@@ -308,9 +308,9 @@ void update_actor_red_blue_shell(struct ShellActor* shell) {
                     func_800C90F4(shell->playerId,
                                   (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x00));
                     if (pad13 == ACTOR_RED_SHELL) {
-                        add_red_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                        add_red_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                     } else {
-                        add_blue_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                        add_blue_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                         func_800C9D80(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x51, 0x01, 0x80, 0x08));
                     }
                 }

src/actors/green_shell/update.inc.c

@@ -75,7 +75,7 @@ void update_actor_green_shell(struct ShellActor* shell) {
                         func_800C9060(shell->playerId, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x04));
                         func_800C90F4(shell->playerId,
                                       (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x00));
-                        add_green_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                        add_green_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                         return;
                     } else {
                         shell->state = 1;
@@ -98,7 +98,7 @@ void update_actor_green_shell(struct ShellActor* shell) {
                     func_800C9060(shell->playerId, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x04));
                     func_800C90F4(shell->playerId,
                                   (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x00));
-                    add_green_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                    add_green_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                 }
             } else {
                 shell->rotAngle += 0xE38;
@@ -108,7 +108,7 @@ void update_actor_green_shell(struct ShellActor* shell) {
                     func_800C9060(shell->playerId, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x04));
                     func_800C90F4(shell->playerId,
                                   (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x00));
-                    add_green_shell_in_unexpired_actor_list(m_FindActorIndex(shell));
+                    add_green_shell_in_unexpired_actor_list(CM_FindActorIndex(shell));
                 }
             }
             if (shell->state == 2) {

src/actors/railroad_crossing/render.inc.c

@@ -27,7 +27,7 @@ void render_actor_railroad_crossing(Camera* arg0, struct RailroadCrossing* rr_cr
             gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING);
             gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
 
-            if (CourseManager_GetCrossingOnTriggered(rr_crossing->crossingTrigger)) {
+            if (CM_GetCrossingOnTriggered(rr_crossing->crossingTrigger)) {
 
                 if (rr_crossing->someTimer < 20) {
                     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_right_active);

src/actors/railroad_crossing/update.inc.c

@@ -9,7 +9,7 @@
  */
 void update_actor_railroad_crossing(struct RailroadCrossing* crossing) {
     // If train close?
-    if (CourseManager_GetCrossingOnTriggered(crossing->crossingTrigger)) {
+    if (CM_GetCrossingOnTriggered(crossing->crossingTrigger)) {
         // Timer++
         crossing->someTimer++;
         // Reset timer

src/camera.c

@@ -58,6 +58,8 @@ void camera_init(f32 posX, f32 posY, f32 posZ, UNUSED s16 rot, u32 arg4, s32 cam
     Player* player = gPlayerOne;
     Camera* camera = &cameras[cameraId];
 
+    camera->cameraId = cameraId;
+
     D_80152300[cameraId] = arg4;
     switch (arg4) {
         case 0:

src/camera.h

@@ -55,6 +55,7 @@ typedef struct {
     /* 0xB0 */ s16 unk_B0;
     /* 0xB2 */ s16 unk_B2;
     /* 0xB4 */ f32 unk_B4;
+               size_t cameraId;
 } Camera; /* size = 0xB8 */
 
 void camera_init(f32, f32, f32, s16, u32, s32);

src/code_800029B0.c

@@ -212,7 +212,7 @@ void setup_race(void) {
     func_80005310();
     func_8003D080();
     init_hud();
-    D_800DC510 = 0;
+    gRaceState = RACE_INIT;
     gNumSpawnedShells = 0;
     D_800DC5B8 = 0;
     D_80152308 = 0;
@@ -254,7 +254,7 @@ void setup_race(void) {
 
 void func_80002DAC(void) {
 
-    CourseManager_SomeSounds();
+    CM_SomeSounds();
 
     // switch (gCurrentCourseId) {
     //     case COURSE_MARIO_RACEWAY:
@@ -324,7 +324,7 @@ void credits_spawn_actors(void) {
     destroy_all_actors();
     CM_CleanWorld();
 
-    CourseManager_CreditsSpawnActors();
+    CM_CreditsSpawnActors();
 
     gNumPermanentActors = gNumActors;
 }