From b56d3692d0187fa4d0483b00028bd353ff1cfad6 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 1 Apr 2023 19:51:31 -0500
Subject: [PATCH] [keel] Make PreloadPtr 64 bit

---
 src/keel/media.cpp | 4 ++--
 src/keel/media.hpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/keel/media.cpp b/src/keel/media.cpp
index a2654a7d..a4ee2e45 100644
--- a/src/keel/media.cpp
+++ b/src/keel/media.cpp
@@ -119,7 +119,7 @@ ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, ox::CRStringView path
 	oxRequire(buff, static_cast<ox::MemFS*>(ctx->rom.get())->directAccess(path));
 	PreloadPtr p;
 	oxReturnError(ox::readMC(buff, stat.size, &p));
-	return p.preloadAddr + ctx->preloadSectionOffset;
+	return static_cast<std::size_t>(p.preloadAddr) + ctx->preloadSectionOffset;
 }
 
 ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, const ox::FileAddress &file) noexcept {
@@ -127,7 +127,7 @@ ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, const ox::FileAddress
 	oxRequire(buff, static_cast<ox::MemFS*>(ctx->rom.get())->directAccess(file));
 	PreloadPtr p;
 	oxReturnError(ox::readMC(buff, stat.size, &p));
-	return p.preloadAddr + ctx->preloadSectionOffset;
+	return static_cast<std::size_t>(p.preloadAddr) + ctx->preloadSectionOffset;
 }
 
 }
diff --git a/src/keel/media.hpp b/src/keel/media.hpp
index c7d8ccba..3d4a2d62 100644
--- a/src/keel/media.hpp
+++ b/src/keel/media.hpp
@@ -21,8 +21,8 @@ namespace keel {
 // data.
 struct PreloadPtr {
 	static constexpr auto TypeName = "net.drinkingtea.keel.PreloadPtr";
-	static constexpr auto TypeVersion = 1;
-	uint32_t preloadAddr = 0;
+	static constexpr auto TypeVersion = 2;
+	uint64_t preloadAddr = 0;
 };
 
 oxModelBegin(PreloadPtr)
@@ -97,8 +97,8 @@ ox::Error buildUuidMap(Context *ctx) noexcept;
 
 template<typename T>
 ox::Result<keel::AssetRef<T>> readObj(
-		[[maybe_unused]] keel::Context *ctx,
-		[[maybe_unused]] ox::CRStringView assetId,
+		keel::Context *ctx,
+		ox::CRStringView assetId,
 		[[maybe_unused]] bool forceLoad = false) noexcept {
 #ifndef OX_BARE_METAL
 	return readObjFile<T>(ctx, assetId, forceLoad);