From 0e028ff653d9c96a9d2b6e1e4c54c019b7095b73 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 25 Jan 2026 22:05:49 -0600
Subject: [PATCH] [ox] Cleanup

---
 deps/ox/src/ox/model/modelhandleradaptor.hpp | 2 +-
 deps/ox/src/ox/model/modelvalue.hpp          | 4 ++--
 deps/ox/src/ox/std/assert.hpp                | 7 +++++++
 deps/ox/src/ox/std/heapmgr.cpp               | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/deps/ox/src/ox/model/modelhandleradaptor.hpp b/deps/ox/src/ox/model/modelhandleradaptor.hpp
index 56078fe8..56f6367a 100644
--- a/deps/ox/src/ox/model/modelhandleradaptor.hpp
+++ b/deps/ox/src/ox/model/modelhandleradaptor.hpp
@@ -135,7 +135,7 @@ class ModelHandlerInterface {
 					return m_handler->field(name, &v->template get<ModelValueArray>());
 			}
 			oxErrf("invalid type: {}: {}\n", name, static_cast<int>(v->type()));
-			ox::panic(ox::Error(1), "invalid type");
+			ox::panic("invalid type");
 			return ox::Error(1, "invalid type");
 		}
 
diff --git a/deps/ox/src/ox/model/modelvalue.hpp b/deps/ox/src/ox/model/modelvalue.hpp
index ec273759..251ac40c 100644
--- a/deps/ox/src/ox/model/modelvalue.hpp
+++ b/deps/ox/src/ox/model/modelvalue.hpp
@@ -168,7 +168,7 @@ class ModelValue {
 		constexpr const auto &get() const noexcept {
 			constexpr auto type = getType<T>();
 			if (m_type != type) [[unlikely]] {
-				ox::panic(ox::Error(1), "invalid cast");
+				ox::panic("invalid cast");
 			}
 			return getValue<type>(*this);
 		}
@@ -178,7 +178,7 @@ class ModelValue {
 		constexpr auto &get() noexcept {
 			constexpr auto type = getType<T>();
 			if (m_type != type) [[unlikely]] {
-				ox::panic(ox::Error(1), "invalid cast");
+				ox::panic("invalid cast");
 			}
 			return getValue<type>(*this);
 		}
diff --git a/deps/ox/src/ox/std/assert.hpp b/deps/ox/src/ox/std/assert.hpp
index 379278bf..b531ff48 100644
--- a/deps/ox/src/ox/std/assert.hpp
+++ b/deps/ox/src/ox/std/assert.hpp
@@ -28,6 +28,13 @@ void panic(
 	StringViewCR panicMsg,
 	std::source_location const &src = std::source_location::current()) noexcept;
 
+[[noreturn]]
+inline void panic(
+	StringViewCR panicMsg,
+	std::source_location const &src = std::source_location::current()) noexcept {
+	panic(Error{1}, panicMsg, src);
+}
+
 [[noreturn]]
 constexpr void constexprPanic(
 	StringViewCR panicMsg,
diff --git a/deps/ox/src/ox/std/heapmgr.cpp b/deps/ox/src/ox/std/heapmgr.cpp
index 8c208ee9..90e9f19c 100644
--- a/deps/ox/src/ox/std/heapmgr.cpp
+++ b/deps/ox/src/ox/std/heapmgr.cpp
@@ -77,7 +77,7 @@ static HeapSegment *findSegmentFor(std::size_t sz) noexcept {
 			return s;
 		}
 	}
-	ox::panic(ox::Error(1), "malloc: could not find segment");
+	ox::panic("malloc: could not find segment");
 	return nullptr;
 }
 
@@ -102,7 +102,7 @@ void free(void *ptr) noexcept {
 	} else if (p.segment) {
 		p.segment->inUse = false;
 	} else {
-		ox::panic(ox::Error(1), "Bad heap free");
+		ox::panic("Bad heap free");
 	}
 }