From b89b8d585e3da04e45e8e6fe04b1728100e9071c Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Mon, 8 Apr 2024 18:10:09 +1000 Subject: oops - restore assets modification to load scripts --- source/base/StarAssets.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source/base/StarAssets.cpp') diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp index b334b31..357fca0 100644 --- a/source/base/StarAssets.cpp +++ b/source/base/StarAssets.cpp @@ -147,8 +147,10 @@ Assets::Assets(Settings settings, StringList assetSources) { pushGlobalContext("assets", makeBaseAssetCallbacks()); auto decorateLuaContext = [&](LuaContext& context, MemoryAssetSourcePtr newFiles) { - auto callbacks = makeBaseAssetCallbacks(); if (newFiles) { + // re-add the assets callbacks with more functions + context.remove("assets"); + auto callbacks = makeBaseAssetCallbacks(); callbacks.registerCallback("add", [&newFiles](LuaEngine& engine, String const& path, LuaValue const& data) { ByteArray bytes; if (auto str = engine.luaMaybeTo(data)) @@ -184,9 +186,9 @@ Assets::Assets(Settings settings, StringList assetSources) { m_filesByExtension[AssetPath::extension(path).toLower()].erase(path); return erased; }); - } - context.setCallbacks("assets", callbacks); + context.setCallbacks("assets", callbacks); + } }; auto addSource = [&](String const& sourcePath, AssetSourcePtr source) { -- cgit v1.2.3