thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add gLevelValues.wallMaxRadius (#815)

Browse source
This commit is contained in:
Sunk 2025-05-20 21:19:02 -04:00 • committed by GitHub
parent 06f1d66dd6
commit ce67d8c0a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autogen/lua_definitions/structs.lua
View file

@ -1113,6 +1113,7 @@
--- @field public vanishCapDurationVcutm integer
--- @field public vanishCapSequence SeqId
--- @field public visibleSecrets integer
--- @field public wallMaxRadius number
--- @field public wdwWaterLevelSpeed number
--- @field public wingCapDuration integer
--- @field public wingCapDurationTotwc integer

1
docs/lua/structs.md
View file

@ -1691,6 +1691,7 @@
| vanishCapDurationVcutm | `integer` | |
| vanishCapSequence | [enum SeqId](constants.md#enum-SeqId) | |
| visibleSecrets | `integer` | |
| wallMaxRadius | `number` | |
| wdwWaterLevelSpeed | `number` | |
| wingCapDuration | `integer` | |
| wingCapDurationTotwc | `integer` | |

6
src/engine/surface_collision.c
View file

@ -128,9 +128,9 @@ static s32 find_wall_collisions_from_list(struct SurfaceNode *surfaceNode,
Vec3f cPos = { 0 };
Vec3f cNorm = { 0 };
// Max collision radius = 200
if (radius > 200.0f) {
radius = 200.0f;
// Default max collision radius = 200
if (radius > gLevelValues.wallMaxRadius) {
radius = gLevelValues.wallMaxRadius;
}
// Stay in this loop until out of walls.

3
src/game/hardcoded.c
View file

@ -126,7 +126,8 @@ struct LevelValues gDefaultLevelValues = {
.wdwWaterLevelSpeed = 10.0f,
.useGlobalStarIds = FALSE,
.zoomOutCameraOnPause = TRUE,
.jrbDarkenSkybox = TRUE
.jrbDarkenSkybox = TRUE,
.wallMaxRadius = 200.0f,
};
struct LevelValues gLevelValues = { 0 };

1
src/game/hardcoded.h
View file

@ -94,6 +94,7 @@ struct LevelValues {
u8 useGlobalStarIds;
u8 zoomOutCameraOnPause;
u8 jrbDarkenSkybox;
f32 wallMaxRadius;
};
extern struct LevelValues gLevelValues;

3
src/pc/lua/smlua_cobject_autogen.c
View file

@ -1338,7 +1338,7 @@ static struct LuaObjectField sLakituStateFields[LUA_LAKITU_STATE_FIELD_COUNT] =
{ "yaw", LVT_S16, offsetof(struct LakituState, yaw), false, LOT_NONE, 1, sizeof(s16) },
};
#define LUA_LEVEL_VALUES_FIELD_COUNT 52
#define LUA_LEVEL_VALUES_FIELD_COUNT 53
static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = {
{ "bubbleOnDeathBarrierInCapStages", LVT_U8, offsetof(struct LevelValues, bubbleOnDeathBarrierInCapStages), false, LOT_NONE, 1, sizeof(u8) },
{ "cellHeightLimit", LVT_S16, offsetof(struct LevelValues, cellHeightLimit), false, LOT_NONE, 1, sizeof(s16) },
@ -1386,6 +1386,7 @@ static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] =
{ "vanishCapDurationVcutm", LVT_U16, offsetof(struct LevelValues, vanishCapDurationVcutm), false, LOT_NONE, 1, sizeof(u16) },
{ "vanishCapSequence", LVT_S32, offsetof(struct LevelValues, vanishCapSequence), false, LOT_NONE, 1, sizeof(enum SeqId) },
{ "visibleSecrets", LVT_U8, offsetof(struct LevelValues, visibleSecrets), false, LOT_NONE, 1, sizeof(u8) },
{ "wallMaxRadius", LVT_F32, offsetof(struct LevelValues, wallMaxRadius), false, LOT_NONE, 1, sizeof(f32) },
{ "wdwWaterLevelSpeed", LVT_F32, offsetof(struct LevelValues, wdwWaterLevelSpeed), false, LOT_NONE, 1, sizeof(f32) },
{ "wingCapDuration", LVT_U16, offsetof(struct LevelValues, wingCapDuration), false, LOT_NONE, 1, sizeof(u16) },
{ "wingCapDurationTotwc", LVT_U16, offsetof(struct LevelValues, wingCapDurationTotwc), false, LOT_NONE, 1, sizeof(u16) },