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>

4 files changed, 9 insertions, 9 deletions

diff --git a/src/actors/blue_and_red_shells/update.inc.c b/src/actors/blue_and_red_shells/update.inc.c
index c09d30d64..277ec2075 100644
--- a/src/actors/blue_and_red_shells/update.inc.c
+++ b/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));
                     }
                 }
diff --git a/src/actors/green_shell/update.inc.c b/src/actors/green_shell/update.inc.c
index 4e4c8f9e8..8499bddc4 100644
--- a/src/actors/green_shell/update.inc.c
+++ b/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) {
diff --git a/src/actors/railroad_crossing/render.inc.c b/src/actors/railroad_crossing/render.inc.c
index adbe7a7e5..10ca253f0 100644
--- a/src/actors/railroad_crossing/render.inc.c
+++ b/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);
diff --git a/src/actors/railroad_crossing/update.inc.c b/src/actors/railroad_crossing/update.inc.c
index 5e1c54ca1..9c96a044a 100644
--- a/src/actors/railroad_crossing/update.inc.c
+++ b/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