From dddbe4bd16c4fbd9dd099ada89f4f9a2d5babdfd Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Tue, 15 Nov 2022 09:16:17 +1000 Subject: [PATCH] Make fixCollisionBugs an integer again (#232) This is for mod compatibility. --- autogen/lua_definitions/structs.lua | 2 +- docs/lua/structs.md | 2 +- src/game/hardcoded.h | 2 +- src/pc/djui/djui_panel_misc.c | 2 +- src/pc/lua/smlua_cobject_autogen.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autogen/lua_definitions/structs.lua b/autogen/lua_definitions/structs.lua index 32d4208b..cbb93852 100644 --- a/autogen/lua_definitions/structs.lua +++ b/autogen/lua_definitions/structs.lua @@ -629,7 +629,7 @@ --- @field public exitCastleArea integer --- @field public exitCastleLevel LevelNum --- @field public exitCastleWarpNode integer ---- @field public fixCollisionBugs boolean +--- @field public fixCollisionBugs integer --- @field public floorLowerLimit integer --- @field public floorLowerLimitMisc integer --- @field public floorLowerLimitShadow integer diff --git a/docs/lua/structs.md b/docs/lua/structs.md index 534e24af..fdc74c42 100644 --- a/docs/lua/structs.md +++ b/docs/lua/structs.md @@ -924,7 +924,7 @@ | exitCastleArea | `integer` | | | exitCastleLevel | [enum LevelNum](constants.md#enum-LevelNum) | | | exitCastleWarpNode | `integer` | | -| fixCollisionBugs | `boolean` | | +| fixCollisionBugs | `integer` | | | floorLowerLimit | `integer` | | | floorLowerLimitMisc | `integer` | | | floorLowerLimitShadow | `integer` | | diff --git a/src/game/hardcoded.h b/src/game/hardcoded.h index 3b6326e1..56510c64 100644 --- a/src/game/hardcoded.h +++ b/src/game/hardcoded.h @@ -37,7 +37,7 @@ struct StarPositions { }; struct LevelValues { - bool fixCollisionBugs; + u8 fixCollisionBugs; enum LevelNum entryLevel; enum LevelNum exitCastleLevel; s16 exitCastleArea; diff --git a/src/pc/djui/djui_panel_misc.c b/src/pc/djui/djui_panel_misc.c index 3a9bae7a..9540a6bc 100644 --- a/src/pc/djui/djui_panel_misc.c +++ b/src/pc/djui/djui_panel_misc.c @@ -17,7 +17,7 @@ void djui_panel_options_debug_create(struct DjuiBase* caller) { djui_base_set_size(&checkbox1->base, 1.0f, 32); defaultBase = &checkbox1->base; - struct DjuiCheckbox* checkbox2 = djui_checkbox_create(&body->base, "Fixed Collisions", &gLevelValues.fixCollisionBugs); + struct DjuiCheckbox* checkbox2 = djui_checkbox_create(&body->base, "Fixed Collisions", (bool*)&gLevelValues.fixCollisionBugs); djui_base_set_size_type(&checkbox2->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); djui_base_set_size(&checkbox2->base, 1.0f, 32); defaultBase = &checkbox2->base; diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index a05d4280..10e19735 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 }, { "floorLowerLimit", LVT_S16, offsetof(struct LevelValues, floorLowerLimit), false, LOT_NONE }, { "floorLowerLimitMisc", LVT_S16, offsetof(struct LevelValues, floorLowerLimitMisc), false, LOT_NONE }, { "floorLowerLimitShadow", LVT_S16, offsetof(struct LevelValues, floorLowerLimitShadow), false, LOT_NONE },