From 37e0ead5bfc66f1fa97626fd5cd24bdf069ab8cd Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Mon, 13 Jan 2025 21:34:23 -0600
Subject: [PATCH] [jasper/world/studio/worldobjectseteditor] Fix build for
 certain compilers

---
 .../worldobjectseteditor/commands/editobject.hpp       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
index ea2daee..d079853 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <type_traits>
+
 #include <ox/fs/fs.hpp>
 
 #include <studio/undostack.hpp>
@@ -16,7 +18,7 @@ namespace jasper::world {
 
 template<
 	WorldObjCommand cmd, auto getVar, auto hasMerge = false,
-	typename ValType = decltype([] { WorldObject o; return std::move(getVar(o)); }())>
+	typename ValType = std::remove_reference_t<decltype(getVar(*new WorldObject))>>
 class EditObject: public studio::UndoCommand {
 	private:
 		WorldObjectSet &m_doc;
@@ -81,13 +83,15 @@ using EditObjectFrames = EditObject<
 	WorldObjCommand::EditObjectFrames,
 	[](WorldObject &obj) -> auto& {
 		return obj.frames;
-	}>;
+	},
+	true>;
 
 using EditObjectInterval = EditObject<
 	WorldObjCommand::EditObjectInterval,
 	[](WorldObject &obj) -> auto& {
 		return obj.intervalMs;
-	}>;
+	},
+	true>;
 
 using EditObjectPalette = EditObject<
 	WorldObjCommand::EditObjectPalette,