Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added gLevelValues.fixCollisionBugsPickBestWall

This commit is contained in:
MysterD 2023-06-22 20:18:10 -07:00
parent 650f009245
commit 738afa377a
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autogen/lua_definitions/structs.lua
View File

@ -653,6 +653,7 @@
--- @field public fixCollisionBugs integer --- @field public fixCollisionBugs integer
--- @field public fixCollisionBugsFalseLedgeGrab integer --- @field public fixCollisionBugsFalseLedgeGrab integer
--- @field public fixCollisionBugsGroundPoundBonks integer --- @field public fixCollisionBugsGroundPoundBonks integer
--- @field public fixCollisionBugsPickBestWall integer
--- @field public fixCollisionBugsRoundedCorners integer --- @field public fixCollisionBugsRoundedCorners integer
--- @field public fixVanishFloors integer --- @field public fixVanishFloors integer
--- @field public floatingStarDance integer --- @field public floatingStarDance integer

1
docs/lua/structs.md
View File

@ -959,6 +959,7 @@
| fixCollisionBugs | `integer` | | | fixCollisionBugs | `integer` | |
| fixCollisionBugsFalseLedgeGrab | `integer` | | | fixCollisionBugsFalseLedgeGrab | `integer` | |
| fixCollisionBugsGroundPoundBonks | `integer` | | | fixCollisionBugsGroundPoundBonks | `integer` | |
| fixCollisionBugsPickBestWall | `integer` | |
| fixCollisionBugsRoundedCorners | `integer` | | | fixCollisionBugsRoundedCorners | `integer` | |
| fixVanishFloors | `integer` | | | fixVanishFloors | `integer` | |
| floatingStarDance | `integer` | | | floatingStarDance | `integer` | |

1
src/game/hardcoded.c
View File

@ -46,6 +46,7 @@ struct LevelValues gDefaultLevelValues = {
.fixCollisionBugsRoundedCorners = 1, .fixCollisionBugsRoundedCorners = 1,
.fixCollisionBugsFalseLedgeGrab = 1, .fixCollisionBugsFalseLedgeGrab = 1,
.fixCollisionBugsGroundPoundBonks = 1, .fixCollisionBugsGroundPoundBonks = 1,
.fixCollisionBugsPickBestWall = 1,
.fixVanishFloors = 0, .fixVanishFloors = 0,
.hudCapTimer = 0, .hudCapTimer = 0,
.hudRedCoinsRadar = 0, .hudRedCoinsRadar = 0,

1
src/game/hardcoded.h
View File

@ -44,6 +44,7 @@ struct LevelValues {
u8 fixCollisionBugsRoundedCorners; u8 fixCollisionBugsRoundedCorners;
u8 fixCollisionBugsFalseLedgeGrab; u8 fixCollisionBugsFalseLedgeGrab;
u8 fixCollisionBugsGroundPoundBonks; u8 fixCollisionBugsGroundPoundBonks;
u8 fixCollisionBugsPickBestWall;
u8 wingCapLookUpReq; u8 wingCapLookUpReq;
u8 fixVanishFloors; u8 fixVanishFloors;
u8 hudCapTimer; u8 hudCapTimer;

2
src/game/mario.c
View File

@ -2385,7 +2385,7 @@ void set_mario_particle_flags(struct MarioState* m, u32 flags, u8 clear) {
void mario_update_wall(struct MarioState* m, struct WallCollisionData* wcd) { void mario_update_wall(struct MarioState* m, struct WallCollisionData* wcd) {
if (!m || !wcd) { return; } if (!m || !wcd) { return; }
if (gLevelValues.fixCollisionBugs) { if (gLevelValues.fixCollisionBugs && gLevelValues.fixCollisionBugsPickBestWall) {
// turn face angle into a direction vector // turn face angle into a direction vector
Vec3f faceAngle; Vec3f faceAngle;
faceAngle[0] = coss(m->faceAngle[0]) * sins(m->faceAngle[1]); faceAngle[0] = coss(m->faceAngle[0]) * sins(m->faceAngle[1]);

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

@ -743,7 +743,7 @@ static struct LuaObjectField sLakituStateFields[LUA_LAKITU_STATE_FIELD_COUNT] =
{ "yaw", LVT_S16, offsetof(struct LakituState, yaw), false, LOT_NONE }, { "yaw", LVT_S16, offsetof(struct LakituState, yaw), false, LOT_NONE },
}; };
#define LUA_LEVEL_VALUES_FIELD_COUNT 41 #define LUA_LEVEL_VALUES_FIELD_COUNT 42
static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = { static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = {
{ "cellHeightLimit", LVT_S16, offsetof(struct LevelValues, cellHeightLimit), false, LOT_NONE }, { "cellHeightLimit", LVT_S16, offsetof(struct LevelValues, cellHeightLimit), false, LOT_NONE },
{ "coinsRequiredForCoinStar", LVT_S16, offsetof(struct LevelValues, coinsRequiredForCoinStar), false, LOT_NONE }, { "coinsRequiredForCoinStar", LVT_S16, offsetof(struct LevelValues, coinsRequiredForCoinStar), false, LOT_NONE },
@ -756,6 +756,7 @@ static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] =
{ "fixCollisionBugs", LVT_U8, offsetof(struct LevelValues, fixCollisionBugs), false, LOT_NONE }, { "fixCollisionBugs", LVT_U8, offsetof(struct LevelValues, fixCollisionBugs), false, LOT_NONE },
{ "fixCollisionBugsFalseLedgeGrab", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsFalseLedgeGrab), false, LOT_NONE }, { "fixCollisionBugsFalseLedgeGrab", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsFalseLedgeGrab), false, LOT_NONE },
{ "fixCollisionBugsGroundPoundBonks", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsGroundPoundBonks), false, LOT_NONE }, { "fixCollisionBugsGroundPoundBonks", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsGroundPoundBonks), false, LOT_NONE },
{ "fixCollisionBugsPickBestWall", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsPickBestWall), false, LOT_NONE },
{ "fixCollisionBugsRoundedCorners", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsRoundedCorners), false, LOT_NONE }, { "fixCollisionBugsRoundedCorners", LVT_U8, offsetof(struct LevelValues, fixCollisionBugsRoundedCorners), false, LOT_NONE },
{ "fixVanishFloors", LVT_U8, offsetof(struct LevelValues, fixVanishFloors), false, LOT_NONE }, { "fixVanishFloors", LVT_U8, offsetof(struct LevelValues, fixVanishFloors), false, LOT_NONE },
{ "floatingStarDance", LVT_U8, offsetof(struct LevelValues, floatingStarDance), false, LOT_NONE }, { "floatingStarDance", LVT_U8, offsetof(struct LevelValues, floatingStarDance), false, LOT_NONE },