thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-10 01:52:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix HOOK_ON_WARP params
Some checks failed
Build coop / build-ubuntu (push) Has been cancelled
Details
Build coop / build-windows (push) Has been cancelled
Details
Build coop / build-macos-arm (push) Has been cancelled
Details
Build coop / build-macos-intel (push) Has been cancelled
Details

Browse source
This commit is contained in:
Agent X 2025-04-15 14:13:58 -04:00
parent 36d76d3cb8
commit 6527ee1b7a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/dynos_warps.cpp
View file

@ -260,7 +260,7 @@ static void *DynOS_Warp_UpdateWarp(void *aCmd, bool aIsLevelInitDone) {
} }
// lua hooks // lua hooks
smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sWarpDest.levelNum, sWarpDest.areaIdx, sWarpDest.nodeId, sWarpDest.arg); smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sDynosWarpLevelNum, sDynosWarpAreaNum, sDynosWarpNodeNum, sWarpDest.arg);
// Reset values // Reset values
sDynosWarpTargetArea = -1; sDynosWarpTargetArea = -1;
@ -405,7 +405,7 @@ static void *DynOS_Warp_UpdateExit(void *aCmd, bool aIsLevelInitDone) {
sDynosExitTargetWarp = NULL; sDynosExitTargetWarp = NULL;
// lua hooks // lua hooks
smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sWarpDest.levelNum, sWarpDest.areaIdx, sWarpDest.nodeId, sWarpDest.arg); smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sDynosWarpLevelNum, sDynosWarpAreaNum, sDynosWarpNodeNum, sWarpDest.arg);
} }
// Phase 4 - Unlock Mario as soon as the second transition is ended // Phase 4 - Unlock Mario as soon as the second transition is ended

2
src/game/rendering_graph_node.c
View file

@ -1206,7 +1206,7 @@ static s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) {
return TRUE; return TRUE;
} }
static void geo_sanitize_object_gfx() { static void geo_sanitize_object_gfx(void) {
geo_append_display_list(obj_sanitize_gfx, LAYER_OPAQUE); geo_append_display_list(obj_sanitize_gfx, LAYER_OPAQUE);
geo_append_display_list(obj_sanitize_gfx, LAYER_ALPHA); geo_append_display_list(obj_sanitize_gfx, LAYER_ALPHA);
geo_append_display_list(obj_sanitize_gfx, LAYER_TRANSPARENT); geo_append_display_list(obj_sanitize_gfx, LAYER_TRANSPARENT);