Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev

This commit is contained in:
MysterD 2022-02-26 16:30:27 -08:00
parent 8fd349e5b1 169cd9fa44
commit f4e1647257
2 changed files with 12 additions and 4 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); waterRing = spawn_object(o, MODEL_WATER_RING, bhvJetStreamWaterRing);
if (waterRing != NULL) { if (waterRing != NULL) {
waterRing->oWaterRingIndex = currentObj->oWaterRingMgrNextRingIndex; waterRing->oWaterRingIndex = currentObj->oWaterRingMgrNextRingIndex;
currentObj->oWaterRingMgrNextRingIndex++;
if (currentObj->oWaterRingMgrNextRingIndex >= 10001) {
currentObj->oWaterRingMgrNextRingIndex = 0;
}
} }
currentObj->oWaterRingMgrNextRingIndex++;
if (currentObj->oWaterRingMgrNextRingIndex >= 10001)
currentObj->oWaterRingMgrNextRingIndex = 0;
} }
} }

9
src/game/mario_actions_automatic.c
View File

@ -65,7 +65,14 @@ void play_climbing_sounds(struct MarioState *m, s32 b) {
s32 set_pole_position(struct MarioState *m, f32 offsetY) { s32 set_pole_position(struct MarioState *m, f32 offsetY) {
if (m->usedObj == NULL) { m->usedObj = cur_obj_find_nearest_pole(); } if (m->usedObj == NULL) { m->usedObj = cur_obj_find_nearest_pole(); }
if (m->usedObj == NULL) { return POLE_NONE; }
// This is here so if somehow a pole despawns while you are on it.
// You will just drop from it.
if (m->usedObj == NULL) {
// If Mario is no longer interacting with the pole, stop the pole holding action.
set_mario_action(m, ACT_FREEFALL, 0);
return POLE_FELL_OFF;
}
UNUSED s32 unused1; UNUSED s32 unused1;
UNUSED s32 unused2; UNUSED s32 unused2;