diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-09-16 09:01:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-16 09:01:55 -0600 |
| commit | 60ac50c9628d25968bfe367e1b4b6f030078be64 (patch) | |
| tree | e03a0d825cfe443adcf076cb643c20692151f431 /src/main.c | |
| parent | 7adfdaa9abb18d76ae80f26bff58c2c4dc4f3f29 (diff) | |
| parent | 8fb42e50d70356300050048b57def3123e6d4552 (diff) | |
Merge branch 'main' into Caladius-patch-1Caladius-patch-1
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c index d942bdc28..1bdbee6e1 100644 --- a/src/main.c +++ b/src/main.c @@ -390,7 +390,7 @@ void update_controller(s32 index) { } void read_controllers(void) { - OSMesg msg; + // OSMesg msg; osContStartReadData(&gSIEventMesgQueue); // osRecvMesg(&gSIEventMesgQueue, &msg, OS_MESG_BLOCK); @@ -419,7 +419,7 @@ void read_controllers(void) { } void func_80000BEC(void) { - gPhysicalZBuffer = VIRTUAL_TO_PHYSICAL(&gZBuffer); + gPhysicalZBuffer = (uintptr_t) VIRTUAL_TO_PHYSICAL(&gZBuffer); } void dispatch_audio_sptask(struct SPTask* spTask) { @@ -727,7 +727,7 @@ void race_logic_loop(void) { } if (gIsGamePaused == false) { - for (size_t i = 0; i < gTickLogic; i++) { + for (size_t i = 0; i < (size_t) gTickLogic; i++) { process_game_tick(); } if (Editor_IsPaused() == false) { @@ -1093,19 +1093,19 @@ void update_gamestate(void) { switch (gGamestate) { case START_MENU_FROM_QUIT: func_80002658(); - gCurrentlyLoadedTrackAddr = NULL; + gCurrentlyLoadedTrackAddr = 0; break; case MAIN_MENU_FROM_QUIT: func_800025D4(); - gCurrentlyLoadedTrackAddr = NULL; + gCurrentlyLoadedTrackAddr = 0; break; case PLAYER_SELECT_MENU_FROM_QUIT: func_80002600(); - gCurrentlyLoadedTrackAddr = NULL; + gCurrentlyLoadedTrackAddr = 0; break; case COURSE_SELECT_MENU_FROM_QUIT: func_8000262C(); - gCurrentlyLoadedTrackAddr = NULL; + gCurrentlyLoadedTrackAddr = 0; break; case RACING: /** @@ -1117,12 +1117,12 @@ void update_gamestate(void) { TrackBrowser_ResetSelectedTrack(); // Same function as gCurrentlyLoadedTrackAddr break; case ENDING: - gCurrentlyLoadedTrackAddr = NULL; + gCurrentlyLoadedTrackAddr = 0; init_segment_ending_sequences(); setup_podium_ceremony(); break; case CREDITS_SEQUENCE: - gCurrentlyLoadedTrackAddr = NULL; + gCurrentlyLoadedTrackAddr = 0; // init_segment_racing(); init_segment_ending_sequences(); load_credits(); |