sm64-mirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-01-22 07:32:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS (#591)

Browse source
This commit is contained in:
Amy54Desu 2024-12-31 09:38:52 +09:00 committed by GitHub
parent 96932f5bf1
commit 1f1683815e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
autogen/lua_definitions/constants.lua
View file

@ -9167,7 +9167,10 @@ HOOK_BEFORE_GEO_PROCESS = 49
HOOK_ON_GEO_PROCESS_CHILDREN = 50
--- @type LuaHookedEventType
HOOK_MAX = 51
HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS = 51
--- @type LuaHookedEventType
HOOK_MAX = 52
--- @class LuaModMenuElementType

3
docs/lua/constants.md
View file

@ -3338,7 +3338,8 @@
| HOOK_ON_GEO_PROCESS | 48 |
| HOOK_BEFORE_GEO_PROCESS | 49 |
| HOOK_ON_GEO_PROCESS_CHILDREN | 50 |
| HOOK_MAX | 51 |
| HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS | 51 |
| HOOK_MAX | 52 |
### [enum LuaModMenuElementType](#LuaModMenuElementType)
| Identifier | Value |

4
src/game/mario.c
View file

@ -1509,6 +1509,10 @@ resetGoto:;
f32 gasLevel;
f32 ceilToFloorDist;
bool allow = true;
smlua_call_event_hooks_mario_param_ret_bool(HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS, m, &allow);
if (!allow) { return; }
f32_find_wall_collision(&m->pos[0], &m->pos[1], &m->pos[2], 60.0f, 50.0f);
f32_find_wall_collision(&m->pos[0], &m->pos[1], &m->pos[2], 30.0f, 24.0f);

3
src/pc/lua/smlua_constants_autogen.c
View file

@ -3205,7 +3205,8 @@ char gSmluaConstants[] = ""
"HOOK_ON_GEO_PROCESS = 48\n"
"HOOK_BEFORE_GEO_PROCESS = 49\n"
"HOOK_ON_GEO_PROCESS_CHILDREN = 50\n"
"HOOK_MAX = 51\n"
"HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS = 51\n"
"HOOK_MAX = 52\n"
"ACTION_HOOK_EVERY_FRAME = 0\n"
"ACTION_HOOK_GRAVITY = 1\n"
"ACTION_HOOK_MAX = 2\n"

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

@ -62,6 +62,7 @@ enum LuaHookedEventType {
HOOK_ON_GEO_PROCESS,
HOOK_BEFORE_GEO_PROCESS,
HOOK_ON_GEO_PROCESS_CHILDREN,
HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS,
HOOK_MAX,
};
@ -117,6 +118,7 @@ static const char* LuaHookedEventTypeName[] = {
"HOOK_ON_GEO_PROCESS",
"HOOK_BEFORE_GEO_PROCESS",
"HOOK_ON_GEO_PROCESS_CHILDREN",
"HOOK_MARIO_OVERRIDE_GEOMETRY_INPUTS",
"HOOK_MAX"
};