Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper NULL check for this in water_ring.c 

The water ring index should NOT increment if a water ring fails to spawn.
This commit is contained in:
Prince Frizzy 2022-02-26 05:46:08 -05:00 committed by djoslin0
parent f11184b8df
commit 26f7e76c02
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/behaviors/water_ring.inc.c
View File

@ -170,10 +170,11 @@ void water_ring_spawner_act_inactive(void) {
waterRing = spawn_object(o, MODEL_WATER_RING, bhvJetStreamWaterRing);
if (waterRing != NULL) {
waterRing->oWaterRingIndex = currentObj->oWaterRingMgrNextRingIndex;
currentObj->oWaterRingMgrNextRingIndex++;
if (currentObj->oWaterRingMgrNextRingIndex >= 10001) {
currentObj->oWaterRingMgrNextRingIndex = 0;
}
}
currentObj->oWaterRingMgrNextRingIndex++;
if (currentObj->oWaterRingMgrNextRingIndex >= 10001)
currentObj->oWaterRingMgrNextRingIndex = 0;
}
}