From 09d26d43b5262f480fd55eab9980eff06a71edbb Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Mon, 26 Jun 2023 01:42:18 +1000 Subject: Add string view variant of Star::String and use it it's 1:30 AM AGAIN !! !!!!! This might have broken the inventory icons of custom hats a little, need to look into that --- source/base/StarAssets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/base/StarAssets.cpp') diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp index ae2d087..320f813 100644 --- a/source/base/StarAssets.cpp +++ b/source/base/StarAssets.cpp @@ -844,7 +844,7 @@ shared_ptr Assets::loadImage(AssetPath const& path) const { return {}; StringMap references; StringList referencePaths; - path.directives.forEach([&](auto const& entry) { + path.directives.forEach([&](auto const& entry, Directives const& directives) { addImageOperationReferences(entry.operation, referencePaths); }); // TODO: This can definitely be better, was changed quickly to support the new Directives. @@ -861,7 +861,7 @@ shared_ptr Assets::loadImage(AssetPath const& path) const { return unlockDuring([&]() { auto newData = make_shared(); Image newImage = *source->image; - path.directives.forEach([&](auto const& entry) { + path.directives.forEach([&](auto const& entry, Directives const& directives) { if (auto error = entry.operation.ptr()) std::rethrow_exception(error->exception); else -- cgit v1.2.3