Fix #400 and divide by zero (#454)

* Divide by zero fix & cup restart behavior fix

* CI Test

* Fix a divide by zero bug. Fix for cups when using the reset button

* Added defines, renamed function

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
Dave Demers
2025-07-19 18:59:21 -04:00
committed by GitHub
parent bc9686f1a3
commit d62d4bb900
6 changed files with 25 additions and 9 deletions
+9 -5
View File
@@ -144,12 +144,8 @@ void CustomEngineInit() {
gWorldInstance.AddCup(gSpecialCup);
gWorldInstance.AddCup(gBattleCup);
/* Set default course; mario raceway */
//SelectMarioRaceway(); // This results in a nullptr
gWorldInstance.CurrentCourse = mario;
gWorldInstance.CurrentCup = gMushroomCup;
gWorldInstance.CurrentCup->CursorPosition = 3;
gWorldInstance.CupIndex = 0;
SetMarioRaceway();
// ModelLoader::LoadModelList bowserStatueList = {
// .course = gBowsersCastle,
@@ -198,6 +194,14 @@ void CM_SpawnFromLevelProps() {
// Editor::SpawnFromLevelProps();
}
// Set default course; mario raceway
void SetMarioRaceway(void) {
SetCourseById(0);
gWorldInstance.CurrentCup = gMushroomCup;
gWorldInstance.CurrentCup->CursorPosition = 3;
gWorldInstance.CupIndex = 0;
}
World* GetWorld(void) {
return &gWorldInstance;
}