NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add message when about to segfault because no floor

Browse Source
This commit is contained in:
jaburns
2021-07-18 20:24:42 -06:00
parent fa3d9e77db
commit ab71363d75
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decomp/game/mario.c
+6
View File
@@ -1833,13 +1833,19 @@ void init_mario(void) {
gMarioState->area = gCurrentArea; gMarioState->area = gCurrentArea;
gMarioState->marioObj = gMarioObject; gMarioState->marioObj = gMarioObject;
gMarioState->marioObj->header.gfx.animInfo.animID = -1; gMarioState->marioObj->header.gfx.animInfo.animID = -1;
vec3s_copy(gMarioState->faceAngle, gMarioSpawnInfo->startAngle); vec3s_copy(gMarioState->faceAngle, gMarioSpawnInfo->startAngle);
vec3s_set(gMarioState->angleVel, 0, 0, 0); vec3s_set(gMarioState->angleVel, 0, 0, 0);
vec3s_to_vec3f(gMarioState->pos, gMarioSpawnInfo->startPos); vec3s_to_vec3f(gMarioState->pos, gMarioSpawnInfo->startPos);
vec3f_set(gMarioState->vel, 0, 0, 0); vec3f_set(gMarioState->vel, 0, 0, 0);
gMarioState->floorHeight = gMarioState->floorHeight =
find_floor(gMarioState->pos[0], gMarioState->pos[1], gMarioState->pos[2], &gMarioState->floor); find_floor(gMarioState->pos[0], gMarioState->pos[1], gMarioState->pos[2], &gMarioState->floor);
if( gMarioState->floor == NULL ) {
printf("Couldn't find floor!\n");
}
gMarioState->curTerrain = gMarioState->floor->terrain; gMarioState->curTerrain = gMarioState->floor->terrain;
if (gMarioState->pos[1] < gMarioState->floorHeight) { if (gMarioState->pos[1] < gMarioState->floorHeight) {