From 571d80aebf16f5a05c24261752ea2b9f04eb7633 Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Wed, 30 Nov 2022 18:44:49 +1000 Subject: [PATCH] make fixCollisionBugs an integer again (2) (#241) --- autogen/lua_definitions/structs.lua | 2 +- docs/lua/structs.md | 2 +- src/game/hardcoded.h | 2 +- src/pc/lua/smlua_cobject_autogen.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen/lua_definitions/structs.lua b/autogen/lua_definitions/structs.lua index 8c05e3a0..df94b4ef 100644 --- a/autogen/lua_definitions/structs.lua +++ b/autogen/lua_definitions/structs.lua @@ -633,7 +633,7 @@ --- @field public exitCastleArea integer --- @field public exitCastleLevel LevelNum --- @field public exitCastleWarpNode integer ---- @field public fixCollisionBugs boolean +--- @field public fixCollisionBugs integer --- @field public fixVanishFloors boolean --- @field public floorLowerLimit integer --- @field public floorLowerLimitMisc integer diff --git a/docs/lua/structs.md b/docs/lua/structs.md index 9df2d9ce..5ccc57d9 100644 --- a/docs/lua/structs.md +++ b/docs/lua/structs.md @@ -928,7 +928,7 @@ | exitCastleArea | `integer` | | | exitCastleLevel | [enum LevelNum](constants.md#enum-LevelNum) | | | exitCastleWarpNode | `integer` | | -| fixCollisionBugs | `boolean` | | +| fixCollisionBugs | `integer` | | | fixVanishFloors | `boolean` | | | floorLowerLimit | `integer` | | | floorLowerLimitMisc | `integer` | | diff --git a/src/game/hardcoded.h b/src/game/hardcoded.h index 3b210157..204fad1c 100644 --- a/src/game/hardcoded.h +++ b/src/game/hardcoded.h @@ -37,7 +37,7 @@ struct StarPositions { }; struct LevelValues { - bool fixCollisionBugs; + u8 fixCollisionBugs; bool fixVanishFloors; enum LevelNum entryLevel; enum LevelNum exitCastleLevel; diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index 2c799760..25c5ad4b 100644 --- a/src/pc/lua/smlua_cobject_autogen.c +++ b/src/pc/lua/smlua_cobject_autogen.c @@ -734,7 +734,7 @@ static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = { "exitCastleArea", LVT_S16, offsetof(struct LevelValues, exitCastleArea), false, LOT_NONE }, { "exitCastleLevel", LVT_S32, offsetof(struct LevelValues, exitCastleLevel), 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 }, { "floorLowerLimit", LVT_S16, offsetof(struct LevelValues, floorLowerLimit), false, LOT_NONE }, { "floorLowerLimitMisc", LVT_S16, offsetof(struct LevelValues, floorLowerLimitMisc), false, LOT_NONE },