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

make fixCollisionBugs an integer again (2) (#241)

Browse source
This commit is contained in:
Isaac0-dev 2022-11-30 18:44:49 +10:00 • committed by GitHub
parent 3214fc1de2
commit 571d80aebf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autogen/lua_definitions/structs.lua
View file

@ -633,7 +633,7 @@
--- @field public exitCastleArea integer --- @field public exitCastleArea integer
--- @field public exitCastleLevel LevelNum --- @field public exitCastleLevel LevelNum
--- @field public exitCastleWarpNode integer --- @field public exitCastleWarpNode integer
--- @field public fixCollisionBugs boolean --- @field public fixCollisionBugs integer
--- @field public fixVanishFloors boolean --- @field public fixVanishFloors boolean
--- @field public floorLowerLimit integer --- @field public floorLowerLimit integer
--- @field public floorLowerLimitMisc integer --- @field public floorLowerLimitMisc integer

2
docs/lua/structs.md
View file

@ -928,7 +928,7 @@
| exitCastleArea | `integer` | | | exitCastleArea | `integer` | |
| exitCastleLevel | [enum LevelNum](constants.md#enum-LevelNum) | | | exitCastleLevel | [enum LevelNum](constants.md#enum-LevelNum) | |
| exitCastleWarpNode | `integer` | | | exitCastleWarpNode | `integer` | |
| fixCollisionBugs | `boolean` | | | fixCollisionBugs | `integer` | |
| fixVanishFloors | `boolean` | | | fixVanishFloors | `boolean` | |
| floorLowerLimit | `integer` | | | floorLowerLimit | `integer` | |
| floorLowerLimitMisc | `integer` | | | floorLowerLimitMisc | `integer` | |

2
src/game/hardcoded.h
View file

@ -37,7 +37,7 @@ struct StarPositions {
}; };
struct LevelValues { struct LevelValues {
bool fixCollisionBugs; u8 fixCollisionBugs;
bool fixVanishFloors; bool fixVanishFloors;
enum LevelNum entryLevel; enum LevelNum entryLevel;
enum LevelNum exitCastleLevel; enum LevelNum exitCastleLevel;

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

@ -734,7 +734,7 @@ static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] =
{ "exitCastleArea", LVT_S16, offsetof(struct LevelValues, exitCastleArea), false, LOT_NONE }, { "exitCastleArea", LVT_S16, offsetof(struct LevelValues, exitCastleArea), false, LOT_NONE },
{ "exitCastleLevel", LVT_S32, offsetof(struct LevelValues, exitCastleLevel), false, LOT_NONE }, { "exitCastleLevel", LVT_S32, offsetof(struct LevelValues, exitCastleLevel), false, LOT_NONE },
{ "exitCastleWarpNode", LVT_U8, offsetof(struct LevelValues, exitCastleWarpNode), false, LOT_NONE }, { "exitCastleWarpNode", LVT_U8, offsetof(struct LevelValues, exitCastleWarpNode), false, LOT_NONE },
{ "fixCollisionBugs", LVT_BOOL, offsetof(struct LevelValues, fixCollisionBugs), false, LOT_NONE }, { "fixCollisionBugs", LVT_U8, offsetof(struct LevelValues, fixCollisionBugs), false, LOT_NONE },
{ "fixVanishFloors", LVT_BOOL, offsetof(struct LevelValues, fixVanishFloors), false, LOT_NONE }, { "fixVanishFloors", LVT_BOOL, offsetof(struct LevelValues, fixVanishFloors), false, LOT_NONE },
{ "floorLowerLimit", LVT_S16, offsetof(struct LevelValues, floorLowerLimit), false, LOT_NONE }, { "floorLowerLimit", LVT_S16, offsetof(struct LevelValues, floorLowerLimit), false, LOT_NONE },
{ "floorLowerLimitMisc", LVT_S16, offsetof(struct LevelValues, floorLowerLimitMisc), false, LOT_NONE }, { "floorLowerLimitMisc", LVT_S16, offsetof(struct LevelValues, floorLowerLimitMisc), false, LOT_NONE },