From 9c712cc38ae706b021807b271899bce56c234fa5 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 11 Feb 2024 17:30:45 -0600
Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 4e50889b..b97d7d99

b97d7d99 [ox/preloader] Remove debug code
ce1eea81 [olympic/keel] Remove debug line

git-subtree-dir: deps/nostalgia
git-subtree-split: b97d7d995632f674d35fbe4d3cc3847c3a144f52
---
 deps/ox/src/ox/preloader/preloader.hpp       | 6 ------
 src/olympic/keel/src/pack.cpp                | 1 +
 src/olympic/studio/applib/src/clawviewer.cpp | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp
index be23d0d..1f1df9f 100644
--- a/deps/ox/src/ox/preloader/preloader.hpp
+++ b/deps/ox/src/ox/preloader/preloader.hpp
@@ -174,26 +174,20 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView name, const T *val)
 	}
 	oxReturnError(pad(val));
 	if constexpr(ox::is_integral_v<T>) {
-		//oxDebug("	integral");
-		//oxDebugf("Preloader::field(name, val): {}", name);
 		return ox::serialize(&m_writer, PlatSpec::correctEndianness(*val));
 	} else if constexpr(ox::is_pointer_v<T>) {
-		//oxDebug("	pointer");
 		const PtrType a = startAlloc(sizeOf<PlatSpec>(val), alignOf<PlatSpec>(*val), m_writer.tellp()) + PlatSpec::RomStart;
 		oxReturnError(field(name, *val));
 		oxReturnError(endAlloc());
 		return ox::serialize(&m_writer, PlatSpec::correctEndianness(a));
 	} else if constexpr(ox::isVector_v<T>) {
-		//oxDebug("	vector");
 		return fieldVector(name, val);
 	} else if constexpr(ox::is_same_v<T, ox::ModelValueVector>) {
 		val->types();
-		//oxDebug("	vector");
 		return fieldVector(name, val);
 	} else if constexpr(ox::is_same_v<T, ox::ModelValueArray>) {
 		return fieldArray(name, val);
 	} else {
-		//oxDebug("	object");
 		m_unionIdx.emplace_back(-1);
 		const auto out = preload<PlatSpec, T>(this, val);
 		m_unionIdx.pop_back();
diff --git a/src/olympic/keel/src/pack.cpp b/src/olympic/keel/src/pack.cpp
index 15bd51b..68dabdc 100644
--- a/src/olympic/keel/src/pack.cpp
+++ b/src/olympic/keel/src/pack.cpp
@@ -34,6 +34,7 @@ static ox::Error pathToInode(
 	}
 	oxRequire(s, dest.stat(path));
 	oxReturnError(o["type"].set(static_cast<int8_t>(ox::FileAddressType::Inode)));
+	oxOutf("path to inode: {} => {}\n", path, s.inode);
 	return data.set(2, s.inode);
 }
 
diff --git a/src/olympic/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp
index f56fe83..58df6d6 100644
--- a/src/olympic/studio/applib/src/clawviewer.cpp
+++ b/src/olympic/studio/applib/src/clawviewer.cpp
@@ -82,6 +82,7 @@ void ClawEditor::drawRow(ox::ModelValue const&value) noexcept {
 		case ox::ModelValue::Type::Union:
 			type = "union";
 			break;
+		case ox::ModelValue::Type::InlineArray:
 		case ox::ModelValue::Type::Vector:
 			type = "list";
 			break;