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>

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
  */