From c2065fe988c0dc4edafcabc44809c8b9bbfb4317 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 19 Feb 2025 21:47:00 -0600
Subject: [PATCH] [keel] Fix loading assets by path

---
 .../src/olympic/keel/include/keel/media.hpp        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/deps/nostalgia/src/olympic/keel/include/keel/media.hpp b/deps/nostalgia/src/olympic/keel/include/keel/media.hpp
index 7faa272..1b2040e 100644
--- a/deps/nostalgia/src/olympic/keel/include/keel/media.hpp
+++ b/deps/nostalgia/src/olympic/keel/include/keel/media.hpp
@@ -64,12 +64,16 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
 namespace detail {
 template<typename T>
 constexpr auto makeLoader(Context &ctx) {
-	return [&ctx](ox::StringViewCR assetId) -> ox::Result<T> {
-		auto const p = ctx.uuidToPath.at(assetId);
-		if (p.error) {
-			return ox::Error{1, "Asset ID not found"};
+	return [&ctx](ox::StringView assetId) -> ox::Result<T> {
+		if (!beginsWith(assetId, "/")) {
+			auto const p = ctx.uuidToPath.at(assetId);
+			if (p.error) {
+				oxErrf("Could not find asset: {}", assetId);
+				return ox::Error{1, "Asset ID not found"};
+			}
+			assetId = *p.value;
 		}
-		OX_REQUIRE(buff, ctx.rom->read(*p.value));
+		OX_REQUIRE(buff, ctx.rom->read(assetId));
 		auto [obj, err] = readAsset<T>(buff);
 		if (err) {
 			if (err != ox::Error_ClawTypeVersionMismatch && err != ox::Error_ClawTypeMismatch) {