From a925acba6ba7d5baedd73975c8ce013f3f4c7312 Mon Sep 17 00:00:00 2001 From: MysterD Date: Mon, 11 Apr 2022 22:14:12 -0700 Subject: [PATCH] Fix for dynos mod actors that replace other actors --- data/dynos_bin_actor.cpp | 3 ++- data/dynos_mgr_actor.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/dynos_bin_actor.cpp b/data/dynos_bin_actor.cpp index 16a4344d..0083da32 100644 --- a/data/dynos_bin_actor.cpp +++ b/data/dynos_bin_actor.cpp @@ -74,7 +74,7 @@ static bool DynOS_Actor_WriteBinary(const SysPath &aOutputFilename, GfxData *aGf GfxData *DynOS_Actor_LoadFromBinary(const SysPath &aPackFolder, const char *aActorName) { struct DynosGfxDataCache { SysPath mPackFolder; Array> mGfxData; }; - static Array sDynosGfxDataCache; + static Array sDynosGfxDataCache = {}; // Look for pack in cache DynosGfxDataCache *_Pack = NULL; @@ -128,6 +128,7 @@ GfxData *DynOS_Actor_LoadFromBinary(const SysPath &aPackFolder, const char *aAct _Pack->mGfxData.Add({ aActorName, _GfxData }); sDynosGfxDataCache.Add(_Pack); } + return _GfxData; } diff --git a/data/dynos_mgr_actor.cpp b/data/dynos_mgr_actor.cpp index 63702eaf..3b94d202 100644 --- a/data/dynos_mgr_actor.cpp +++ b/data/dynos_mgr_actor.cpp @@ -39,7 +39,6 @@ void DynOS_Actor_AddCustom(const SysPath &aPackFolder, const char *aActorName) { sDynosCustomActors.Add({ actorName, geoLayout }); } else { index = foundIndex; - free(actorName); } // Alloc and init the actors gfx list