Fix gLevelValues.numCoinsToLife div/0 error (#500)

Sunketchupm · web-flow · commit 382b03d97f58 · 2024-11-20T07:48:11.000+10:00
diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
@@ -3269,7 +3269,7 @@ void print_hud_course_complete_coins(s16 x, s16 y) {
                     gMarioStates[0].numLives++;
                 }
             } else {
-                if (gCourseCompleteCoins % gLevelValues.numCoinsToLife == 0 && gCourseCompleteCoins > 0) {
+                if (gLevelValues.numCoinsToLife != 0 && gCourseCompleteCoins % gLevelValues.numCoinsToLife == 0 && gCourseCompleteCoins > 0) {
                     play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource);
                     gMarioStates[0].numLives++;
                 }
diff --git a/src/game/level_update.c b/src/game/level_update.c
@@ -1121,7 +1121,7 @@ void update_hud_values(void) {
                             play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource);
                         }
                     } else {
-                        if (gHudDisplay.coins % gLevelValues.numCoinsToLife == 0 && gHudDisplay.coins > 0) {
+                        if (gLevelValues.numCoinsToLife != 0 && gHudDisplay.coins % gLevelValues.numCoinsToLife == 0 && gHudDisplay.coins > 0) {
                             gMarioState->numLives++;
                             play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource);
                         }

Original file line number	Diff line number	Diff line change
`@@ -3269,7 +3269,7 @@ void print_hud_course_complete_coins(s16 x, s16 y) {`
`3269`	`3269`	`gMarioStates[0].numLives++;`
`3270`	`3270`	`}`
`3271`	`3271`	`} else {`
`3272`		`- if (gCourseCompleteCoins % gLevelValues.numCoinsToLife == 0 && gCourseCompleteCoins > 0) {`
	`3272`	`+ if (gLevelValues.numCoinsToLife != 0 && gCourseCompleteCoins % gLevelValues.numCoinsToLife == 0 && gCourseCompleteCoins > 0) {`
`3273`	`3273`	`play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource);`
`3274`	`3274`	`gMarioStates[0].numLives++;`
`3275`	`3275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ void update_hud_values(void) {`
`1121`	`1121`	`play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource);`
`1122`	`1122`	`}`
`1123`	`1123`	`} else {`
`1124`		`- if (gHudDisplay.coins % gLevelValues.numCoinsToLife == 0 && gHudDisplay.coins > 0) {`
	`1124`	`+ if (gLevelValues.numCoinsToLife != 0 && gHudDisplay.coins % gLevelValues.numCoinsToLife == 0 && gHudDisplay.coins > 0) {`
`1125`	`1125`	`gMarioState->numLives++;`
`1126`	`1126`	`play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource);`
`1127`	`1127`	`}`