From bd5514d0fd19e7a050ca7f508dfdb82caf0eaba0 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Mon, 31 Aug 2026 17:00:13 -0500
Subject: [PATCH 1/2] make stonesense coords work better with df coords

---
 commonTypes.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/commonTypes.h b/commonTypes.h
index 74f3fc6b..0f368d34 100644
--- a/commonTypes.h
+++ b/commonTypes.h
@@ -92,8 +92,9 @@ struct Crd3D {
 
 struct OptCrd3D : public std::optional<Crd3D>
 {
+    using coord_t = decltype(df::coord::x);
     operator df::coord() const {
-        return has_value() ? df::coord{ uint16_t(value().x), uint16_t(value().y), uint16_t(value().z) } : df::coord{};
+        return has_value() ? df::coord{ static_cast<coord_t>(value().x), static_cast<coord_t>(value().y), static_cast<coord_t>(value().z) } : df::coord{};
     }
     OptCrd3D() {};
     OptCrd3D(const df::coord& c) {

From d52e92e7848877c91b34599ad9a5cc54cc385a8a Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Mon, 31 Aug 2026 17:31:49 -0500
Subject: [PATCH 2/2] add missing include

---
 commonTypes.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/commonTypes.h b/commonTypes.h
index 0f368d34..0bf095fd 100644
--- a/commonTypes.h
+++ b/commonTypes.h
@@ -6,6 +6,8 @@
 
 #include "common.h"
 #include "SpriteColors.h"
+
+#include "df/coord.h"
 #include "df/enabler.h"
 #include "df/graphic.h"