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

Return -1 instead of crashing if no floor under mario on create

Browse Source
This commit is contained in:
jaburns
2021-07-22 21:25:02 -06:00
parent 8144865975
commit be84cd333a
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decomp/game/mario.c
+5 -6
View File
@@ -1,6 +1,5 @@
#include <stdlib.h>
#include <math.h>
#include <stdio.h> // For printf before exit, TODO remove
#include "../shim.h"
#include "../include/PR/os_cont.h"
@@ -1797,7 +1796,7 @@ s32 execute_mario_action(UNUSED struct Object *o) {
* INITIALIZATION *
**************************************************/
void init_mario(void) {
int init_mario(void) {
//Vec3s capPos;
//struct Object *capObject;
@@ -1843,12 +1842,10 @@ void init_mario(void) {
gMarioState->floorHeight =
find_floor(gMarioState->pos[0], gMarioState->pos[1], gMarioState->pos[2], &gMarioState->floor);
if( gMarioState->floor == NULL ) {
printf("Couldn't find floor!\n");
if (gMarioState->floor != NULL) {
gMarioState->curTerrain = gMarioState->floor->terrain;
}
gMarioState->curTerrain = gMarioState->floor->terrain;
if (gMarioState->pos[1] < gMarioState->floorHeight) {
gMarioState->pos[1] = gMarioState->floorHeight;
}
@@ -1886,6 +1883,8 @@ void init_mario(void) {
capObject->oMoveAngleYaw = 0;
}
#endif
return gMarioState->floor != NULL ? 0 : -1;
}
void init_mario_from_save_file(void) {