thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-28 21:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly fix lua interaction flags (#704)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Details
Build coop / build-windows (push) Waiting to run
Details
Build coop / build-macos-arm (push) Waiting to run
Details
Build coop / build-macos-intel (push) Waiting to run
Details

Browse source 
Reverts a change Isaac did a little while ago and fixes the source of the issue
This commit is contained in:
Sunk 2025-03-14 13:47:23 -04:00 • committed by GitHub
parent edacdcc7e4
commit dc4ac0f681
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/interaction.c
View file

@ -166,7 +166,8 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) {
if ((interaction == 0 || interaction & INT_LUA) && action & ACT_FLAG_ATTACKING) { if ((interaction == 0 || interaction & INT_LUA) && action & ACT_FLAG_ATTACKING) {
u32 flags = (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING); u32 flags = (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING);
if (m->flags & flags) { if ((action == ACT_PUNCHING || action == ACT_MOVE_PUNCHING || action == ACT_JUMP_KICK) ||
((m->flags & flags) && (interaction & INT_LUA))) {
s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1]; s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1];
if (m->flags & MARIO_PUNCHING) { if (m->flags & MARIO_PUNCHING) {

2
src/pc/lua/smlua_hooks.c
View file

@ -1177,12 +1177,12 @@ int smlua_hook_mario_action(lua_State* L) {
lua_Integer interactionType = 0; lua_Integer interactionType = 0;
if (paramCount >= 3) { if (paramCount >= 3) {
interactionType = smlua_to_integer(L, 3); interactionType = smlua_to_integer(L, 3);
interactionType |= (1 << 31); /* INT_LUA */
if (!gSmLuaConvertSuccess) { if (!gSmLuaConvertSuccess) {
LOG_LUA_LINE("Hook Action: tried to hook invalid interactionType: %lld, %u", interactionType, gSmLuaConvertSuccess); LOG_LUA_LINE("Hook Action: tried to hook invalid interactionType: %lld, %u", interactionType, gSmLuaConvertSuccess);
return 0; return 0;
} }
} }
interactionType |= (1 << 31); /* INT_LUA */
struct LuaHookedMarioAction* hooked = &sHookedMarioActions[sHookedMarioActionsCount]; struct LuaHookedMarioAction* hooked = &sHookedMarioActions[sHookedMarioActionsCount];