etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-26 05:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make fixCollisionBugs an integer again (#232)

Browse source 
This is for mod compatibility.
This commit is contained in:
Isaac0-dev 2022-11-15 09:16:17 +10:00 committed by GitHub
parent c2d1c85299
commit dddbe4bd16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autogen/lua_definitions/structs.lua
View file

@ -629,7 +629,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 floorLowerLimit integer --- @field public floorLowerLimit integer
--- @field public floorLowerLimitMisc integer --- @field public floorLowerLimitMisc integer
--- @field public floorLowerLimitShadow integer --- @field public floorLowerLimitShadow integer

2
docs/lua/structs.md
View file

@ -924,7 +924,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` | |
| floorLowerLimit | `integer` | | | floorLowerLimit | `integer` | |
| floorLowerLimitMisc | `integer` | | | floorLowerLimitMisc | `integer` | |
| floorLowerLimitShadow | `integer` | | | floorLowerLimitShadow | `integer` | |

2
src/game/hardcoded.h
View file

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

2
src/pc/djui/djui_panel_misc.c
View file

@ -17,7 +17,7 @@ void djui_panel_options_debug_create(struct DjuiBase* caller) {
djui_base_set_size(&checkbox1->base, 1.0f, 32); djui_base_set_size(&checkbox1->base, 1.0f, 32);
defaultBase = &checkbox1->base; 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_type(&checkbox2->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&checkbox2->base, 1.0f, 32); djui_base_set_size(&checkbox2->base, 1.0f, 32);
defaultBase = &checkbox2->base; defaultBase = &checkbox2->base;

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 },
{ "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 },
{ "floorLowerLimitShadow", LVT_S16, offsetof(struct LevelValues, floorLowerLimitShadow), false, LOT_NONE }, { "floorLowerLimitShadow", LVT_S16, offsetof(struct LevelValues, floorLowerLimitShadow), false, LOT_NONE },