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 /include | |
| 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 'include')
| -rw-r--r-- | include/actor_types.h | 8 | ||||
| -rw-r--r-- | include/defines.h | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/include/actor_types.h b/include/actor_types.h index 2b600ec13..e4998ae4f 100644 --- a/include/actor_types.h +++ b/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 diff --git a/include/defines.h b/include/defines.h index e088066cb..c982a7bdd 100644 --- a/include/defines.h +++ b/include/defines.h @@ -196,6 +196,19 @@ enum { COURSE_ONE, COURSE_TWO, COURSE_THREE, COURSE_FOUR }; #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 */ #define SCREEN_MODE_1P 0 |