From 049e767ac6fa88b99370f8c29fb6242697761c62 Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Wed, 2 Apr 2025 12:42:14 +1000 Subject: [PATCH] free stuff --- data/dynos.c.h | 1 + data/dynos.cpp.h | 1 + data/dynos_c.cpp | 4 ++++ data/dynos_misc.cpp | 4 ++++ src/game/scroll_targets.c | 1 + 5 files changed, 11 insertions(+) diff --git a/data/dynos.c.h b/data/dynos.c.h index fb40b2f1b..c99db532e 100644 --- a/data/dynos.c.h +++ b/data/dynos.c.h @@ -86,6 +86,7 @@ void dynos_model_clear_pool(enum ModelPool aModelPool); // -- other -- // void dynos_mod_shutdown(void); +void dynos_pending_scroll_targets_clear(void); void dynos_add_scroll_target(u32 index, const char *name, u32 offset, u32 size); #endif diff --git a/data/dynos.cpp.h b/data/dynos.cpp.h index 259edaf36..83f526ea8 100644 --- a/data/dynos.cpp.h +++ b/data/dynos.cpp.h @@ -1092,6 +1092,7 @@ bool DynOS_Bin_Compress(const SysPath &aFilename); BinFile *DynOS_Bin_Decompress(const SysPath &aFilename); void DynOS_Find_Pending_Scroll_Target(Vtx *data, Vtx *newData); +void DynOS_Pending_Scroll_Targets_Clear(); void DynOS_Add_Scroll_Target(u32 index, const char *name, u32 offset, u32 size); #endif diff --git a/data/dynos_c.cpp b/data/dynos_c.cpp index 5e7a0811b..bb21202dc 100644 --- a/data/dynos_c.cpp +++ b/data/dynos_c.cpp @@ -284,4 +284,8 @@ void dynos_add_scroll_target(u32 index, const char *name, u32 offset, u32 size) DynOS_Add_Scroll_Target(index, name, offset, size); } +void dynos_pending_scroll_targets_clear(void) { + DynOS_Pending_Scroll_Targets_Clear(); +} + } diff --git a/data/dynos_misc.cpp b/data/dynos_misc.cpp index c46b8c748..cb3def737 100644 --- a/data/dynos_misc.cpp +++ b/data/dynos_misc.cpp @@ -125,6 +125,10 @@ void DynOS_Find_Pending_Scroll_Target(Vtx *data, Vtx *newData) { } } +void DynOS_Pending_Scroll_Targets_Clear() { + sPendingScrollTargets.clear(); +} + void DynOS_Add_Scroll_Target(u32 index, const char* name, u32 offset, u32 size) { for (auto& lvlPair : DynOS_Lvl_GetArray()) { for (auto& node : lvlPair.second->mVertices) { diff --git a/src/game/scroll_targets.c b/src/game/scroll_targets.c index 5f34aec21..9bd5b4aea 100644 --- a/src/game/scroll_targets.c +++ b/src/game/scroll_targets.c @@ -108,6 +108,7 @@ void free_vtx_scroll_targets(void) { } hmap_destroy(sScrollTargets); sScrollTargets = NULL; + dynos_pending_scroll_targets_clear(); } void patch_scroll_targets_before(void) {