From ba46209910c5834268af82deea1478037378f945 Mon Sep 17 00:00:00 2001 From: Prince Frizzy Date: Wed, 22 Feb 2023 20:27:28 -0500 Subject: [PATCH 1/3] Hopefully fix GCC error. (#294) --- data/dynos_mgr_pack.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/dynos_mgr_pack.cpp b/data/dynos_mgr_pack.cpp index 118a240d..b1bbc5bd 100644 --- a/data/dynos_mgr_pack.cpp +++ b/data/dynos_mgr_pack.cpp @@ -138,7 +138,10 @@ PackData* DynOS_Pack_Add(const SysPath& aPath) { s32 index = _DynosPacks.Count(); const PackData packData = { .mIndex = index, + .mEnabled = false, + .mEnabledSet = false, .mPath = aPath, + .mDisplayName = "", .mGfxData = {}, .mTextures = {}, .mLoaded = false, From 71a4196cafba72ab98a94c11453693074b4f50b7 Mon Sep 17 00:00:00 2001 From: Sunk <69110309+Sunketchupm@users.noreply.github.com> Date: Wed, 22 Feb 2023 20:28:23 -0500 Subject: [PATCH 2/3] Add HOOK_BEFORE_SET_MARIO_ACTION (#253) * Small quality of life changes Disabled fixed collision in sm74 by default. Popping should now completely set the popped player's speed to 0. * Add HOOK_BEFORE_SET_MARIO_ACTION Param: incoming action Return: changes incoming action If the return value is 1, prevent the action from happening entirely. 0 can't be used here since it'll break the title screen. * Update hooks.md * Revert "Small quality of life changes" This reverts commit 05dd235cd0e3633bf1da48bc2f9f0b8a3db087ee. --- autogen/lua_definitions/constants.lua | 5 ++++- autogen/lua_definitions/structs.lua | 1 + docs/lua/constants.md | 3 ++- docs/lua/guides/hooks.md | 1 + docs/lua/structs.md | 1 + src/game/mario.c | 4 ++++ src/pc/lua/smlua_cobject_autogen.c | 3 ++- src/pc/lua/smlua_constants_autogen.c | 3 ++- src/pc/lua/smlua_hooks.c | 27 +++++++++++++++++++++++++++ src/pc/lua/smlua_hooks.h | 3 +++ 10 files changed, 47 insertions(+), 4 deletions(-) diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index ba3e1f95..bf1a4e97 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -8152,7 +8152,10 @@ HOOK_OBJECT_SET_MODEL = 28 HOOK_CHARACTER_SOUND = 29 --- @type LuaHookedEventType -HOOK_MAX = 30 +HOOK_BEFORE_SET_MARIO_ACTION = 30 + +--- @type LuaHookedEventType +HOOK_MAX = 31 --- @class HudDisplayFlags diff --git a/autogen/lua_definitions/structs.lua b/autogen/lua_definitions/structs.lua index d5c29f91..496abcb8 100644 --- a/autogen/lua_definitions/structs.lua +++ b/autogen/lua_definitions/structs.lua @@ -760,6 +760,7 @@ --- @field public unkC4 number --- @field public usedObj Object --- @field public vel Vec3f +--- @field public visibleToEnemies integer --- @field public wall Surface --- @field public wallKickTimer integer --- @field public wallNormal Vec3f diff --git a/docs/lua/constants.md b/docs/lua/constants.md index 38107ff6..bc0fc846 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -2894,7 +2894,8 @@ | HOOK_ON_CHAT_MESSAGE | 27 | | HOOK_OBJECT_SET_MODEL | 28 | | HOOK_CHARACTER_SOUND | 29 | -| HOOK_MAX | 30 | +| HOOK_BEFORE_SET_MARIO_ACTION | 30 | +| HOOK_MAX | 31 | [:arrow_up_small:](#) diff --git a/docs/lua/guides/hooks.md b/docs/lua/guides/hooks.md index 04a8dd10..61a13695 100644 --- a/docs/lua/guides/hooks.md +++ b/docs/lua/guides/hooks.md @@ -116,6 +116,7 @@ The lua functions sent to `hook_event()` will be automatically called by SM64 wh | HOOK_ON_CHAT_MESSAGE | Called when a chat message gets sent. Return `false` to prevent the message from being sent. | [MarioState](structs.md#MarioState) messageSender | | HOOK_OBJECT_SET_MODEL | Called when a behavior changes models. Also runs when a behavior spawns. | [Object](structs.md#Object) obj, `integer` modelID | | HOOK_CHARACTER_SOUND | Called when mario retrieves a character sound to play, return a character sound or `0` to override it. | [MarioState](structs.md#MarioState) mario, [enum CharacterSound](constants.md#enum-CharacterSound) characterSound | +| HOOK_BEFORE_SET_MARIO_ACTION | Called before Mario's action changes. Return an action to change the incoming action or `1` to cancel the action change. | `integer` incomingAction | ### Parameters diff --git a/docs/lua/structs.md b/docs/lua/structs.md index d52a4c5e..063f04eb 100644 --- a/docs/lua/structs.md +++ b/docs/lua/structs.md @@ -1086,6 +1086,7 @@ | unkC4 | `number` | | | usedObj | [Object](structs.md#Object) | | | vel | [Vec3f](structs.md#Vec3f) | read-only | +| visibleToEnemies | `integer` | | | wall | [Surface](structs.md#Surface) | | | wallKickTimer | `integer` | | | wallNormal | [Vec3f](structs.md#Vec3f) | read-only | diff --git a/src/game/mario.c b/src/game/mario.c index c6bd9557..33915df7 100644 --- a/src/game/mario.c +++ b/src/game/mario.c @@ -1093,6 +1093,10 @@ static u32 set_mario_action_cutscene(struct MarioState *m, u32 action, UNUSED u3 * specific function if needed. */ u32 set_mario_action(struct MarioState *m, u32 action, u32 actionArg) { + u32 returnValue = 0; + smlua_call_event_hooks_int_param_ret_int(HOOK_BEFORE_SET_MARIO_ACTION, action, &returnValue); + if (returnValue == 1) { return TRUE; } else if (returnValue) { action = returnValue; } + switch (action & ACT_GROUP_MASK) { case ACT_GROUP_MOVING: action = set_mario_action_moving(m, action, actionArg); diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index dd4c43b0..a0c02515 100644 --- a/src/pc/lua/smlua_cobject_autogen.c +++ b/src/pc/lua/smlua_cobject_autogen.c @@ -800,7 +800,7 @@ static struct LuaObjectField sMarioBodyStateFields[LUA_MARIO_BODY_STATE_FIELD_CO { "wingFlutter", LVT_S8, offsetof(struct MarioBodyState, wingFlutter), false, LOT_NONE }, }; -#define LUA_MARIO_STATE_FIELD_COUNT 76 +#define LUA_MARIO_STATE_FIELD_COUNT 77 static struct LuaObjectField sMarioStateFields[LUA_MARIO_STATE_FIELD_COUNT] = { { "action", LVT_U32, offsetof(struct MarioState, action), false, LOT_NONE }, { "actionArg", LVT_U32, offsetof(struct MarioState, actionArg), false, LOT_NONE }, @@ -873,6 +873,7 @@ static struct LuaObjectField sMarioStateFields[LUA_MARIO_STATE_FIELD_COUNT] = { { "unkC4", LVT_F32, offsetof(struct MarioState, unkC4), false, LOT_NONE }, { "usedObj", LVT_COBJECT_P, offsetof(struct MarioState, usedObj), false, LOT_OBJECT }, { "vel", LVT_COBJECT, offsetof(struct MarioState, vel), true, LOT_VEC3F }, + { "visibleToEnemies", LVT_U8, offsetof(struct MarioState, visibleToEnemies), false, LOT_NONE }, { "wall", LVT_COBJECT_P, offsetof(struct MarioState, wall), false, LOT_SURFACE }, { "wallKickTimer", LVT_U8, offsetof(struct MarioState, wallKickTimer), false, LOT_NONE }, { "wallNormal", LVT_COBJECT, offsetof(struct MarioState, wallNormal), true, LOT_VEC3F }, diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index f1b2a483..0e5ee625 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -2893,7 +2893,8 @@ char gSmluaConstants[] = "" "HOOK_ON_CHAT_MESSAGE = 27\n" "HOOK_OBJECT_SET_MODEL = 28\n" "HOOK_CHARACTER_SOUND = 29\n" -"HOOK_MAX = 30\n" +"HOOK_BEFORE_SET_MARIO_ACTION = 30\n" +"HOOK_MAX = 31\n" "ACTION_HOOK_EVERY_FRAME = 0\n" "ACTION_HOOK_GRAVITY = 1\n" "ACTION_HOOK_MAX = 2\n" diff --git a/src/pc/lua/smlua_hooks.c b/src/pc/lua/smlua_hooks.c index fea23728..62dc571f 100644 --- a/src/pc/lua/smlua_hooks.c +++ b/src/pc/lua/smlua_hooks.c @@ -676,6 +676,33 @@ bool smlua_call_event_hooks_mario_charactersound_param_ret_int(enum LuaHookedEve return false; } +void smlua_call_event_hooks_int_param_ret_int(enum LuaHookedEventType hookType, u32 param, u32* returnValue) { + lua_State* L = gLuaState; + if (L == NULL) { return; } + struct LuaHookedEvent* hook = &sHookedEvents[hookType]; + for (int i = 0; i < hook->count; i++) { + s32 prevTop = lua_gettop(L); + + // push the callback onto the stack + lua_rawgeti(L, LUA_REGISTRYINDEX, hook->reference[i]); + + // push params + lua_pushinteger(L, param); + + // call the callback + if (0 != smlua_call_hook(L, 1, 1, 0, hook->mod[i])) { + LOG_LUA("Failed to call the callback: %u", hookType); + continue; + } + + // output the return value + if (lua_type(L, -1) == LUA_TNUMBER) { + *returnValue = smlua_to_integer(L, -1); + } + lua_settop(L, prevTop); + } +} + //////////////////// // hooked actions // //////////////////// diff --git a/src/pc/lua/smlua_hooks.h b/src/pc/lua/smlua_hooks.h index f1838117..f522d867 100644 --- a/src/pc/lua/smlua_hooks.h +++ b/src/pc/lua/smlua_hooks.h @@ -41,6 +41,7 @@ enum LuaHookedEventType { HOOK_ON_CHAT_MESSAGE, HOOK_OBJECT_SET_MODEL, HOOK_CHARACTER_SOUND, + HOOK_BEFORE_SET_MARIO_ACTION, HOOK_MAX, }; @@ -75,6 +76,7 @@ static const char* LuaHookedEventTypeName[] = { "HOOK_ON_CHAT_MESSAGE", "HOOK_OBJECT_SET_MODEL", "HOOK_CHARACTER_SOUND", + "HOOK_BEFORE_SET_MARIO_ACTION", "HOOK_MAX" }; @@ -113,6 +115,7 @@ void smlua_call_event_hooks_use_act_select(enum LuaHookedEventType hookType, int void smlua_call_event_hooks_ret_bool(enum LuaHookedEventType hookType, bool* returnValue); void smlua_call_event_hooks_on_chat_message(enum LuaHookedEventType hookType, struct MarioState* m, const char* message, bool* returnValue); bool smlua_call_event_hooks_mario_charactersound_param_ret_int(enum LuaHookedEventType hookType, struct MarioState* m, enum CharacterSound characterSound, s32* returnValue); +void smlua_call_event_hooks_int_param_ret_int(enum LuaHookedEventType hookType, u32 param, u32* returnValue); enum BehaviorId smlua_get_original_behavior_id(const BehaviorScript* behavior); const BehaviorScript* smlua_override_behavior(const BehaviorScript* behavior); From 7e04c8acca685d782f07228bf767a27dfe9de9ab Mon Sep 17 00:00:00 2001 From: Prince Frizzy Date: Thu, 23 Feb 2023 00:44:51 -0500 Subject: [PATCH 3/3] Fix memory leak generating .tex files. (#295) --- data/dynos_bin_tex.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/dynos_bin_tex.cpp b/data/dynos_bin_tex.cpp index a7b7852a..b6034a4e 100644 --- a/data/dynos_bin_tex.cpp +++ b/data/dynos_bin_tex.cpp @@ -417,6 +417,8 @@ static void DynOS_Tex_GeneratePack_Recursive(const SysPath &aPackFolder, SysPath SysPath _RelativePath = fstring("%s%s", aRelativePath.c_str(), _PackEnt->d_name); if (containsC && !is_level_number_png(_RelativePath)) { + // Don't forgot to free the texture data we've read. + Delete(_TexData); continue; } @@ -433,6 +435,8 @@ static void DynOS_Tex_GeneratePack_Recursive(const SysPath &aPackFolder, SysPath // if we aren't overriding a texture, only generate textures in the output directory SysPath _OutputFolder = fstring("%s/", aOutputFolder.c_str()); if (_OverrideName == NULL && (!aAllowCustomTextures || strcmp(_DirPath.c_str(), _OutputFolder.c_str()))) { + // Don't forgot to free the texture data we've read. + Delete(_TexData); continue; } @@ -444,6 +448,9 @@ static void DynOS_Tex_GeneratePack_Recursive(const SysPath &aPackFolder, SysPath } DynOS_Tex_WriteBinary(aGfxData, _OutputPath, _BaseName, _TexData, (_OverrideName != NULL)); + + // Don't forgot to free the texture data we've read. + Delete(_TexData); } closedir(_PackDir);