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

Copied a fix that extends the region Mario can explore beyond shorts from @ckosmic's fork.

Browse Source
This commit is contained in:
MeltyPlayer
2022-10-20 00:18:43 -05:00
parent 478d28ed7d
commit c035455ff7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decomp/game/area.h
+1 -1
View File
@@ -35,7 +35,7 @@ struct InstantWarp
struct SpawnInfo struct SpawnInfo
{ {
/*0x00*/ Vec3s startPos; /*0x00*/ Vec3f startPos;
/*0x06*/ Vec3s startAngle; /*0x06*/ Vec3s startAngle;
/*0x0C*/ s8 areaIndex; /*0x0C*/ s8 areaIndex;
/*0x0D*/ s8 activeAreaIndex; /*0x0D*/ s8 activeAreaIndex;
src/decomp/game/mario.c
+1 -1
View File
@@ -1838,7 +1838,7 @@ int init_mario(void) {
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); vec3f_copy(gMarioState->pos, gMarioSpawnInfo->startPos);
vec3f_set(gMarioState->vel, 0, 0, 0); vec3f_set(gMarioState->vel, 0, 0, 0);
gMarioState->floorHeight = gMarioState->floorHeight =
src/libsm64.c
+1 -1
View File
@@ -139,7 +139,7 @@ SM64_LIB_FN void sm64_static_surfaces_load( const struct SM64Surface *surfaceArr
surfaces_load_static( surfaceArray, numSurfaces ); surfaces_load_static( surfaceArray, numSurfaces );
} }
SM64_LIB_FN int32_t sm64_mario_create( int16_t x, int16_t y, int16_t z ) SM64_LIB_FN int32_t sm64_mario_create( float x, float y, float z )
{ {
int32_t marioIndex = obj_pool_alloc_index( &s_mario_instance_pool, sizeof( struct MarioInstance )); int32_t marioIndex = obj_pool_alloc_index( &s_mario_instance_pool, sizeof( struct MarioInstance ));
struct MarioInstance *newInstance = s_mario_instance_pool.objects[marioIndex]; struct MarioInstance *newInstance = s_mario_instance_pool.objects[marioIndex];
src/libsm64.h
+2 -2
View File
@@ -22,7 +22,7 @@ struct SM64Surface
int16_t type; int16_t type;
int16_t force; int16_t force;
uint16_t terrain; uint16_t terrain;
int16_t vertices[3][3]; int32_t vertices[3][3];
}; };
struct SM64MarioInputs struct SM64MarioInputs
@@ -82,7 +82,7 @@ extern SM64_LIB_FN void sm64_global_terminate( void );
extern SM64_LIB_FN void sm64_static_surfaces_load( const struct SM64Surface *surfaceArray, uint32_t numSurfaces ); extern SM64_LIB_FN void sm64_static_surfaces_load( const struct SM64Surface *surfaceArray, uint32_t numSurfaces );
extern SM64_LIB_FN int32_t sm64_mario_create( int16_t x, int16_t y, int16_t z ); extern SM64_LIB_FN int32_t sm64_mario_create( float x, float y, float z );
extern SM64_LIB_FN void sm64_mario_tick( int32_t marioId, const struct SM64MarioInputs *inputs, struct SM64MarioState *outState, struct SM64MarioGeometryBuffers *outBuffers ); extern SM64_LIB_FN void sm64_mario_tick( int32_t marioId, const struct SM64MarioInputs *inputs, struct SM64MarioState *outState, struct SM64MarioGeometryBuffers *outBuffers );
extern SM64_LIB_FN void sm64_mario_delete( int32_t marioId ); extern SM64_LIB_FN void sm64_mario_delete( int32_t marioId );