vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 63076ecf53 into d7ca2c0436

This commit is contained in:
redegg89 2025-01-06 07:00:17 -05:00 committed by GitHub
parent d7ca2c0436 63076ecf53
commit db4de80510
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
enhancements/PU_fix.patch Normal file
View File

@ -0,0 +1,56 @@
diff --git a/src/engine/surface_collision.c b/src/engine/surface_collision.c
index c639c354..11e16fab 100644
--- a/src/engine/surface_collision.c
+++ b/src/engine/surface_collision.c
@@ -348,5 +348,5 @@ static struct Surface *find_ceil_from_list(struct SurfaceNode *surfaceNode, s32
* Find the lowest ceiling above a given position and return the height.
*/
-f32 find_ceil(f32 posX, f32 posY, f32 posZ, struct Surface **pceil) {
+s16 find_ceil(s16 posX, s16 posY, s16 posZ, struct Surface **pceil) {
s16 cellZ, cellX;
struct Surface *ceil, *dynamicCeil;
@@ -425,5 +425,5 @@ static u8 unused8038BE50[0x40];
* sFloorGeo.
*/
-f32 find_floor_height_and_data(f32 xPos, f32 yPos, f32 zPos, struct FloorGeometry **floorGeo) {
+s16 find_floor_height_and_data(s16 xPos, s16 yPos, s16 zPos, struct FloorGeometry **floorGeo) {
struct Surface *floor;
f32 floorHeight = find_floor(xPos, yPos, zPos, &floor);
@@ -525,5 +525,5 @@ static struct Surface *find_floor_from_list(struct SurfaceNode *surfaceNode, s32
* Find the height of the highest floor below a point.
*/
-f32 find_floor_height(f32 x, f32 y, f32 z) {
+s16 find_floor_height(s16 x, s16 y, s16 z) {
struct Surface *floor;
@@ -562,5 +562,5 @@ f32 unused_find_dynamic_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfl
* Find the highest floor under a given position and return the height.
*/
-f32 find_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfloor) {
+s16 find_floor(s16 xPos, s16 yPos, s16 zPos, struct Surface **pfloor) {
s16 cellZ, cellX;
diff --git a/src/engine/surface_collision.h b/src/engine/surface_collision.h
index 39c5fa24..7a267110 100644
--- a/src/engine/surface_collision.h
+++ b/src/engine/surface_collision.h
@@ -10,5 +10,5 @@
struct WallCollisionData
{
- /*0x00*/ f32 x, y, z;
+ /*0x00*/ s16 x, y, z;
/*0x0C*/ f32 offsetY;
/*0x10*/ f32 radius;
@@ -29,8 +29,8 @@ struct FloorGeometry
s32 f32_find_wall_collision(f32 *xPtr, f32 *yPtr, f32 *zPtr, f32 offsetY, f32 radius);
s32 find_wall_collisions(struct WallCollisionData *colData);
-f32 find_ceil(f32 posX, f32 posY, f32 posZ, struct Surface **pceil);
-f32 find_floor_height_and_data(f32 xPos, f32 yPos, f32 zPos, struct FloorGeometry **floorGeo);
-f32 find_floor_height(f32 x, f32 y, f32 z);
-f32 find_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfloor);
+s16 find_ceil(s16 posX, s16 posY, s16 posZ, struct Surface **pceil);
+s16 find_floor_height_and_data(s16 xPos, s16 yPos, s16 zPos, struct FloorGeometry **floorGeo);
+s16 find_floor_height(s16 x, s16 y, s16 z);
+s16 find_floor(s16 xPos, s16 yPos, s16 zPos, struct Surface **pfloor);
f32 find_water_level(f32 x, f32 z);
f32 find_poison_gas_level(f32 x, f32 z);

8
enhancements/README.md
View File

@ -23,3 +23,11 @@ This allows the game to be rendered at 60 FPS instead of 30 FPS by interpolation
The Mario head intro is the only exception which is still rendered at 30 FPS.
This is the 60fps patch from [sm64-port](https://github.com/sm64-port/sm64-port/tree/master/enhancements) adapted for sm64ex.
## Fix PUs - `PU_fix.patch`
This is a fix to patch out parallel universes.
Now you only appear at a different part of the map. Not sure if that's better or not, but it's an option.
Please note that your movement can become restricted at lower speeds.