From 4b824ddef4905be497e7ef449ed4d9decf1d9cc2 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 14 Dec 2023 23:56:14 -0600
Subject: [PATCH] [olympic] Change readClaw to take ref to TypeStore

---
 src/olympic/keel/include/keel/asset.hpp              | 2 +-
 src/olympic/keel/include/keel/pack.hpp               | 2 +-
 src/olympic/keel/src/asset.cpp                       | 2 +-
 src/olympic/keel/src/pack.cpp                        | 2 +-
 src/olympic/studio/modlib/include/studio/project.hpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/olympic/keel/include/keel/asset.hpp b/src/olympic/keel/include/keel/asset.hpp
index 04b258fc..3a63ed3d 100644
--- a/src/olympic/keel/include/keel/asset.hpp
+++ b/src/olympic/keel/include/keel/asset.hpp
@@ -31,7 +31,7 @@ ox::Result<T> readAsset(const ox::Buffer &buff) noexcept {
 	return ox::readClaw<T>(buff.data() + offset, buff.size() - offset);
 }
 
-ox::Result<ox::ModelObject> readAsset(ox::TypeStore *ts, const ox::Buffer &buff) noexcept;
+ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, const ox::Buffer &buff) noexcept;
 
 struct AssetHdr {
 	ox::UUID uuid;
diff --git a/src/olympic/keel/include/keel/pack.hpp b/src/olympic/keel/include/keel/pack.hpp
index 85dc5a1c..4f48452d 100644
--- a/src/olympic/keel/include/keel/pack.hpp
+++ b/src/olympic/keel/include/keel/pack.hpp
@@ -89,7 +89,7 @@ ox::Error preloadObj(
 		ox::CRStringView path) noexcept {
 	// load file
 	oxRequireM(buff, romFs.read(path));
-	oxRequireM(obj, keel::readAsset(&ts, buff));
+	oxRequireM(obj, keel::readAsset(ts, buff));
 	if (obj.type()->preloadable) {
 		oxOutf("preloading {}\n", path);
 		// preload
diff --git a/src/olympic/keel/src/asset.cpp b/src/olympic/keel/src/asset.cpp
index dad82a19..39ab4d89 100644
--- a/src/olympic/keel/src/asset.cpp
+++ b/src/olympic/keel/src/asset.cpp
@@ -21,7 +21,7 @@ ox::Result<ox::UUID> readUuidHeader(const char *buff, std::size_t buffLen) noexc
 	return ox::UUID::fromString(ox::StringView(buff + k1Hdr.bytes(), 36));
 }
 
-ox::Result<ox::ModelObject> readAsset(ox::TypeStore *ts, ox::Buffer const&buff) noexcept {
+ox::Result<ox::ModelObject> readAsset(ox::TypeStore &ts, ox::Buffer const&buff) noexcept {
 	std::size_t offset = 0;
 	if (!readUuidHeader(buff).error) {
 		offset = K1HdrSz;
diff --git a/src/olympic/keel/src/pack.cpp b/src/olympic/keel/src/pack.cpp
index 04b1eb66..5a89c488 100644
--- a/src/olympic/keel/src/pack.cpp
+++ b/src/olympic/keel/src/pack.cpp
@@ -95,7 +95,7 @@ static ox::Error doTransformations(
 	oxRequireM(buff, dest.read(s.inode));
 	oxReturnError(keel::performPackTransforms(ctx, buff));
 	// transform FileAddresses
-	oxRequireM(obj, keel::readAsset(&ts, buff));
+	oxRequireM(obj, keel::readAsset(ts, buff));
 	oxReturnError(transformFileAddressesObj(ctx, dest, obj));
 	oxReturnError(ox::writeClaw(obj).moveTo(buff));
 	// write file to dest
diff --git a/src/olympic/studio/modlib/include/studio/project.hpp b/src/olympic/studio/modlib/include/studio/project.hpp
index 1a21b545..37d016c2 100644
--- a/src/olympic/studio/modlib/include/studio/project.hpp
+++ b/src/olympic/studio/modlib/include/studio/project.hpp
@@ -133,7 +133,7 @@ template<typename T>
 ox::Result<T> Project::loadObj(ox::CRStringView path) const noexcept {
 	oxRequire(buff, loadBuff(path));
 	if constexpr(ox::is_same_v<T, ox::ModelObject>) {
-		return keel::readAsset(&m_typeStore, buff);
+		return keel::readAsset(m_typeStore, buff);
 	} else {
 		return keel::readAsset<T>(buff);
 	}