print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added global force parameter (thx cozies)

Browse Source
This commit is contained in:
Reonu
2021-08-02 17:44:03 +01:00
parent cc3ecd1939
commit 179fc3196b
4 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/engine/surface_load.c
View File

@@ -15,6 +15,8 @@
#include "game/object_list_processor.h"
#include "surface_load.h"
#include "config.h"
s32 unused8038BE90;
/**
@@ -389,6 +391,7 @@ static struct Surface *read_surface_data(s16 *vertexData, s16 **vertexIndices) {
return surface;
}
#ifndef ALL_SURFACES_HAVE_FORCE
/**
* Returns whether a surface has exertion/moves Mario
* based on the surface type.
@@ -412,6 +415,7 @@ static s32 surface_has_force(s16 surfaceType) {
}
return hasForce;
}
#endif
/**
* Returns whether a surface should have the
@@ -444,7 +448,9 @@ static void load_static_surfaces(s16 **data, s16 *vertexData, s16 surfaceType, s
s32 numSurfaces;
struct Surface *surface;
s8 room = 0;
#ifndef ALL_SURFACES_HAVE_FORCE
s16 hasForce = surface_has_force(surfaceType);
#endif
s16 flags = surf_has_no_cam_collision(surfaceType);
numSurfaces = *(*data);
@@ -462,19 +468,27 @@ static void load_static_surfaces(s16 **data, s16 *vertexData, s16 surfaceType, s
surface->type = surfaceType;
surface->flags = (s8) flags;
#ifdef ALL_SURFACES_HAVE_FORCE
surface->force = *(*data + 3);
#else
if (hasForce) {
surface->force = *(*data + 3);
} else {
surface->force = 0;
}
#endif
add_surface(surface, FALSE);
}
#ifdef ALL_SURFACES_HAVE_FORCE
*data += 4;
#else
*data += 3;
if (hasForce) {
*data += 1;
}
#endif
}
}
@@ -549,7 +563,9 @@ u32 get_area_terrain_size(s16 *data) {
s32 numVertices;
s32 numRegions;
s32 numSurfaces;
#ifndef ALL_SURFACES_HAVE_FORCE
s16 hasForce;
#endif
while (!end) {
terrainLoadType = *data++;
@@ -578,8 +594,12 @@ u32 get_area_terrain_size(s16 *data) {
default:
numSurfaces = *data++;
#ifdef ALL_SURFACES_HAVE_FORCE
data += 4 * numSurfaces;
#else
hasForce = surface_has_force(terrainLoadType);
data += (3 + hasForce) * numSurfaces;
#endif
break;
}
}
@@ -709,7 +729,9 @@ void load_object_surfaces(s16 **data, s16 *vertexData) {
s32 surfaceType;
s32 i;
s32 numSurfaces;
#ifndef ALL_SURFACES_HAVE_FORCE
s16 hasForce;
#endif
s16 flags;
s16 room;
@@ -719,7 +741,9 @@ void load_object_surfaces(s16 **data, s16 *vertexData) {
numSurfaces = *(*data);
(*data)++;
#ifndef ALL_SURFACES_HAVE_FORCE
hasForce = surface_has_force(surfaceType);
#endif
flags = surf_has_no_cam_collision(surfaceType);
flags |= SURFACE_FLAG_DYNAMIC;
@@ -739,22 +763,30 @@ void load_object_surfaces(s16 **data, s16 *vertexData) {
surface->object = gCurrentObject;
surface->type = surfaceType;
#ifdef ALL_SURFACES_HAVE_FORCE
surface->force = *(*data + 3);
#else
if (hasForce) {
surface->force = *(*data + 3);
} else {
surface->force = 0;
}
#endif
surface->flags |= flags;
surface->room = (s8) room;
add_surface(surface, TRUE);
}
#ifdef ALL_SURFACES_HAVE_FORCE
*data += 4;
#else
if (hasForce) {
*data += 4;
} else {
*data += 3;
}
#endif
}
}