From 9870e18bf51d9a103493e65bc670f6e8b2eaca0d Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Mon, 4 Mar 2024 20:09:53 -0500 Subject: [PATCH] Add OBJ_LIST_EXT in place of OBJ_LIST_UNUSED_1 --- autogen/lua_definitions/constants.lua | 2 +- data/dynos_bin_behavior.cpp | 2 +- docs/lua/constants.md | 2 +- src/game/object_list_processor.c | 1 + src/game/object_list_processor.h | 2 +- src/pc/lua/smlua_constants_autogen.c | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index e6ca3b06..aaf2d26b 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -7676,7 +7676,7 @@ TIME_STOP_UNKNOWN_0 = (1 << 0) OBJ_LIST_PLAYER = 0 --- @type ObjectList -OBJ_LIST_UNUSED_1 = 1 +OBJ_LIST_EXT = 1 --- @type ObjectList OBJ_LIST_DESTRUCTIVE = 2 diff --git a/data/dynos_bin_behavior.cpp b/data/dynos_bin_behavior.cpp index 19c58f46..82886daa 100644 --- a/data/dynos_bin_behavior.cpp +++ b/data/dynos_bin_behavior.cpp @@ -168,7 +168,7 @@ s64 DynOS_Bhv_ParseBehaviorIntegerScriptConstants(const String &_Arg, bool *foun // Object List Types bhv_constant(OBJ_LIST_PLAYER); - bhv_constant(OBJ_LIST_UNUSED_1); + bhv_constant(OBJ_LIST_EXT); bhv_constant(OBJ_LIST_DESTRUCTIVE); bhv_constant(OBJ_LIST_UNUSED_3); bhv_constant(OBJ_LIST_GENACTOR); diff --git a/docs/lua/constants.md b/docs/lua/constants.md index fad9143c..099a4f57 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -2743,7 +2743,7 @@ | Identifier | Value | | :--------- | :---- | | OBJ_LIST_PLAYER | 0 | -| OBJ_LIST_UNUSED_1 | 1 | +| OBJ_LIST_EXT | 1 | | OBJ_LIST_DESTRUCTIVE | 2 | | OBJ_LIST_UNUSED_3 | 3 | | OBJ_LIST_GENACTOR | 4 | diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c index 283a9602..f2f65891 100644 --- a/src/game/object_list_processor.c +++ b/src/game/object_list_processor.c @@ -180,6 +180,7 @@ s8 sObjectListUpdateOrder[] = { OBJ_LIST_SPAWNER, OBJ_LIST_LEVEL, OBJ_LIST_DEFAULT, OBJ_LIST_UNIMPORTANT, + OBJ_LIST_EXT, -1 }; /** diff --git a/src/game/object_list_processor.h b/src/game/object_list_processor.h index 1f4ab5c0..dc9b7a33 100644 --- a/src/game/object_list_processor.h +++ b/src/game/object_list_processor.h @@ -32,7 +32,7 @@ enum ObjectList { OBJ_LIST_PLAYER, // (0) Mario - OBJ_LIST_UNUSED_1, // (1) (unused) + OBJ_LIST_EXT, // (1) extra object list for Lua mods to use OBJ_LIST_DESTRUCTIVE, // (2) things that can be used to destroy other objects, like // bob-ombs and corkboxes OBJ_LIST_UNUSED_3, // (3) (unused) diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 0fdf098d..bd75e559 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -2763,7 +2763,7 @@ char gSmluaConstants[] = "" "TIME_STOP_ACTIVE = (1 << 6)\n" "OBJECT_POOL_CAPACITY = 1200\n" "OBJ_LIST_PLAYER = 0\n" -"OBJ_LIST_UNUSED_1 = 1\n" +"OBJ_LIST_EXT = 1\n" "OBJ_LIST_DESTRUCTIVE = 2\n" "OBJ_LIST_UNUSED_3 = 3\n" "OBJ_LIST_GENACTOR = 4\n"