Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED to HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED

This commit is contained in:
Agent X 2024-06-12 09:42:43 -04:00
parent 8bae9e2ec7
commit 41525c1fc3
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autogen/convert_constants.py
View File

@ -51,7 +51,8 @@ in_files = [
exclude_constants = {
"*": [ "^MAXCONTROLLERS$", "^AREA_[^T].*", "^AREA_T[HTO]", "^CONT_ERR.*", "^READ_MASK$", "^SIGN_RANGE$", ],
"src/game/obj_behaviors.c": [ "^o$" ],
"src/pc/djui/djui_console.h": [ "CONSOLE_MAX_TMP_BUFFER" ]
"src/pc/djui/djui_console.h": [ "CONSOLE_MAX_TMP_BUFFER" ],
"src/pc/lua/smlua_hooks.h": [ "MAX_HOOKED_MOD_MENU_ELEMENTS" ]
}
include_constants = {

2
autogen/lua_definitions/constants.lua
View File

@ -9213,7 +9213,7 @@ HOOK_ON_COLLIDE_LEVEL_BOUNDS = 37
HOOK_MIRROR_MARIO_RENDER = 38
--- @type LuaHookedEventType
HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED = 39
HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED = 39
--- @type LuaHookedEventType
HOOK_ON_OBJECT_LOAD = 40

2
docs/lua/constants.md
View File

@ -3289,7 +3289,7 @@
| HOOK_ON_HUD_RENDER_BEHIND | 36 |
| HOOK_ON_COLLIDE_LEVEL_BOUNDS | 37 |
| HOOK_MIRROR_MARIO_RENDER | 38 |
| HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED | 39 |
| HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED | 39 |
| HOOK_ON_OBJECT_LOAD | 40 |
| HOOK_ON_PLAY_SOUND | 41 |
| HOOK_ON_SEQ_LOAD | 42 |

2
mods/mquake/_mquake_f_hooks.lua
View File

@ -8,7 +8,7 @@ hook_mario_action(ACT_DM_AIR_MOVEMENT_METAL, act_dm_air_movement)
hook_mario_action(ACT_DM_POLE_MOVEMENT, act_dm_pole_movement)
hook_mario_action(ACT_DM_WATER_MOVEMENT, act_dm_water_movement)
hook_event(HOOK_ON_PLAYER_CONNECTED, on_player_connected)
hook_event(HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED, override_defacto)
hook_event(HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED, override_defacto)
hook_event(HOOK_CHARACTER_SOUND, allow_voice)
hook_event(HOOK_BEFORE_SET_MARIO_ACTION, before_set_mario_action)
hook_event(HOOK_ON_SET_MARIO_ACTION, on_set_mario_action)

2
src/game/mario_step.c
View File

@ -363,7 +363,7 @@ s32 perform_ground_step(struct MarioState *m) {
Vec3f step = { 0 };
if (m->floor) {
f32 floorNormal;
if (!smlua_call_event_hooks_mario_param_ret_float(HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED, m, &floorNormal)) {
if (!smlua_call_event_hooks_mario_param_ret_float(HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED, m, &floorNormal)) {
floorNormal = m->floor->normal.y;
}
step[0] = floorNormal * (m->vel[0] / 4.0f);

2
src/pc/lua/smlua_constants_autogen.c
View File

@ -3286,7 +3286,7 @@ char gSmluaConstants[] = ""
"HOOK_ON_HUD_RENDER_BEHIND = 36\n"
"HOOK_ON_COLLIDE_LEVEL_BOUNDS = 37\n"
"HOOK_MIRROR_MARIO_RENDER = 38\n"
"HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED = 39\n"
"HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED = 39\n"
"HOOK_ON_OBJECT_LOAD = 40\n"
"HOOK_ON_PLAY_SOUND = 41\n"
"HOOK_ON_SEQ_LOAD = 42\n"

4
src/pc/lua/smlua_hooks.h
View File

@ -50,7 +50,7 @@ enum LuaHookedEventType {
HOOK_ON_HUD_RENDER_BEHIND,
HOOK_ON_COLLIDE_LEVEL_BOUNDS,
HOOK_MIRROR_MARIO_RENDER,
HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED,
HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED,
HOOK_ON_OBJECT_LOAD,
HOOK_ON_PLAY_SOUND,
HOOK_ON_SEQ_LOAD,
@ -99,7 +99,7 @@ static const char* LuaHookedEventTypeName[] = {
"HOOK_ON_HUD_RENDER_BEHIND",
"HOOK_ON_COLLIDE_LEVEL_BOUNDS",
"HOOK_MIRROR_MARIO_RENDER",
"HOOK_OVERRIDE_PHYS_STEP_DEFACTO_SPEED",
"HOOK_MARIO_OVERRIDE_PHYS_STEP_DEFACTO_SPEED",
"HOOK_ON_OBJECT_LOAD",
"HOOK_ON_PLAY_SOUND",
"HOOK_ON_SEQ_LOAD",