thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-17 05:22:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to fix crash that mentions get_mario_spawn_type()

Browse source
This commit is contained in:
MysterD 2022-05-28 00:14:57 -07:00
parent 2cee62f45e
commit 38b2c81189
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
developer/debug.sh
View file

@ -15,4 +15,4 @@ if [ ! -f "$FILE" ]; then
WINPTY= WINPTY=
fi fi
$WINPTY cgdb $FILE -ex 'break debug_breakpoint_here' $WINPTY cgdb $FILE -ex 'r'

12
src/game/level_update.c
View file

@ -397,7 +397,7 @@ void init_mario_after_warp(void) {
if (spawnNode == NULL || spawnNode->object == NULL) { return; } if (spawnNode == NULL || spawnNode->object == NULL) { return; }
u32 marioSpawnType = get_mario_spawn_type(spawnNode->object); u32 marioSpawnType = get_mario_spawn_type(spawnNode->object);
if (gMarioState->action != ACT_UNINITIALIZED) { if (gMarioState && gMarioState->action != ACT_UNINITIALIZED) {
for (s32 i = 0; i < MAX_PLAYERS; i++) { for (s32 i = 0; i < MAX_PLAYERS; i++) {
gPlayerSpawnInfos[i].startPos[0] = (s16) spawnNode->object->oPosX; gPlayerSpawnInfos[i].startPos[0] = (s16) spawnNode->object->oPosX;
gPlayerSpawnInfos[i].startPos[1] = (s16) spawnNode->object->oPosY; gPlayerSpawnInfos[i].startPos[1] = (s16) spawnNode->object->oPosY;
@ -454,7 +454,9 @@ void init_mario_after_warp(void) {
gMarioState->usedObj = spawnNode->object; gMarioState->usedObj = spawnNode->object;
} }
reset_camera(gCurrentArea->camera); if (gCurrentArea) {
reset_camera(gCurrentArea->camera);
}
sWarpDest.type = WARP_TYPE_NOT_WARPING; sWarpDest.type = WARP_TYPE_NOT_WARPING;
sDelayedWarpOp = WARP_OP_NONE; sDelayedWarpOp = WARP_OP_NONE;
@ -482,8 +484,10 @@ void init_mario_after_warp(void) {
break; break;
} }
if (gCurrDemoInput == NULL) { if (gCurrDemoInput == NULL && gMarioState) {
set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0); if (gCurrentArea) {
set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
}
if (gMarioState->flags & MARIO_METAL_CAP) { if (gMarioState->flags & MARIO_METAL_CAP) {
play_cap_music(SEQUENCE_ARGS(4, SEQ_EVENT_METAL_CAP)); play_cap_music(SEQUENCE_ARGS(4, SEQ_EVENT_METAL_CAP));