thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add null checks to initiate_delayed_warp()

Browse source
This commit is contained in:
MysterD 2022-05-03 22:08:30 -07:00
parent ee032fe123
commit 7868a61d6a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/level_update.c
View file

@ -975,7 +975,7 @@ void initiate_delayed_warp(void) {
if ((gCurrCreditsEntry != NULL) && (gCurrCreditsEntry->levelNum == gLevelValues.skipCreditsAt)) { if ((gCurrCreditsEntry != NULL) && (gCurrCreditsEntry->levelNum == gLevelValues.skipCreditsAt)) {
lvl_skip_credits(); lvl_skip_credits();
} else { } else if (gCurrCreditsEntry != NULL) {
// instance players in the credits // instance players in the credits
gCurrActStarNum = 99; gCurrActStarNum = 99;
gCurrActNum = 99; gCurrActNum = 99;
@ -991,7 +991,7 @@ void initiate_delayed_warp(void) {
if ((gCurrCreditsEntry != NULL) && (gCurrCreditsEntry->levelNum == gLevelValues.skipCreditsAt)) { if ((gCurrCreditsEntry != NULL) && (gCurrCreditsEntry->levelNum == gLevelValues.skipCreditsAt)) {
lvl_skip_credits(); lvl_skip_credits();
} else { } else if (gCurrCreditsEntry != NULL) {
gCurrActNum = gCurrCreditsEntry->unk02 & 0x07; gCurrActNum = gCurrCreditsEntry->unk02 & 0x07;
if ((gCurrCreditsEntry + 1)->levelNum == LEVEL_NONE) { if ((gCurrCreditsEntry + 1)->levelNum == LEVEL_NONE) {
destWarpNode = WARP_NODE_CREDITS_END; destWarpNode = WARP_NODE_CREDITS_END;
@ -1006,12 +1006,14 @@ void initiate_delayed_warp(void) {
default: default:
warpNode = area_get_warp_node(sSourceWarpNodeId); warpNode = area_get_warp_node(sSourceWarpNodeId);
initiate_warp(warpNode->node.destLevel & 0x7F, warpNode->node.destArea, if (warpNode != NULL) {
warpNode->node.destNode, sDelayedWarpArg); initiate_warp(warpNode->node.destLevel & 0x7F, warpNode->node.destArea,
warpNode->node.destNode, sDelayedWarpArg);
check_if_should_set_warp_checkpoint(&warpNode->node); check_if_should_set_warp_checkpoint(&warpNode->node);
if (sWarpDest.type != WARP_TYPE_CHANGE_LEVEL) { if (sWarpDest.type != WARP_TYPE_CHANGE_LEVEL) {
level_set_transition(2, NULL); level_set_transition(2, NULL);
}
} }
break; break;
} }