etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-10-19 11:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Proper NULL check for this in water_ring.c

Browse source 
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 d3b4e1c794
commit 0fc5f0d768
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/behaviors/water_ring.inc.c
View file

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