From 38038f8fad17ae087f07db74a1a7ccb11bca174a Mon Sep 17 00:00:00 2001
From: Jan Laupetin <jan@laupetin.net>
Date: Tue, 27 Jan 2026 19:04:58 +0100
Subject: [PATCH] fix: clang compilation issues

---
 src/ModMan/Utils/DispatchableThread.h                      | 4 ++--
 src/ModMan/main.cpp                                        | 4 ++--
 src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp | 2 +-
 src/ObjLoading/XModel/Gltf/GltfInput.h                     | 2 +-
 src/ZoneWriting/Writing/ContentWriterBase.h                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ModMan/Utils/DispatchableThread.h b/src/ModMan/Utils/DispatchableThread.h
index 383ef586..f557d6b9 100644
--- a/src/ModMan/Utils/DispatchableThread.h
+++ b/src/ModMan/Utils/DispatchableThread.h
@@ -15,9 +15,9 @@ public:
     DispatchableThread();
     ~DispatchableThread();
     DispatchableThread(const DispatchableThread& other) = delete;
-    DispatchableThread(DispatchableThread&& other) noexcept = default;
+    DispatchableThread(DispatchableThread&& other) noexcept = delete;
     DispatchableThread& operator=(const DispatchableThread& other) = delete;
-    DispatchableThread& operator=(DispatchableThread&& other) noexcept = default;
+    DispatchableThread& operator=(DispatchableThread&& other) noexcept = delete;
 
     void Start();
     void Terminate();
diff --git a/src/ModMan/main.cpp b/src/ModMan/main.cpp
index 4441853f..ebd59dbc 100644
--- a/src/ModMan/main.cpp
+++ b/src/ModMan/main.cpp
@@ -134,10 +134,10 @@ int main(int argc, const char** argv)
     ModManArgs args;
     auto shouldContinue = true;
     if (!args.ParseArgs(MODMAN_ARGC, MODMAN_ARGV, shouldContinue))
-        return false;
+        return 1;
 
     if (!shouldContinue)
-        return true;
+        return 0;
 
     con::info("Starting ModMan " GIT_VERSION);
 
diff --git a/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp b/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp
index 1b2aad5f..84421051 100644
--- a/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp
+++ b/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp
@@ -1334,7 +1334,7 @@ namespace
     public:
         MaterialLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt)
             : m_memory(memory),
-              m_search_path(m_search_path),
+              m_search_path(searchPath),
               m_gdt(gdt)
         {
         }
diff --git a/src/ObjLoading/XModel/Gltf/GltfInput.h b/src/ObjLoading/XModel/Gltf/GltfInput.h
index 6bb5486f..0fdb6513 100644
--- a/src/ObjLoading/XModel/Gltf/GltfInput.h
+++ b/src/ObjLoading/XModel/Gltf/GltfInput.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdlib>
-#include <nlohmann/json_fwd.hpp>
+#include <nlohmann/json.hpp>
 
 namespace gltf
 {
diff --git a/src/ZoneWriting/Writing/ContentWriterBase.h b/src/ZoneWriting/Writing/ContentWriterBase.h
index 47da7b56..9d6dcb3a 100644
--- a/src/ZoneWriting/Writing/ContentWriterBase.h
+++ b/src/ZoneWriting/Writing/ContentWriterBase.h
@@ -13,8 +13,8 @@ public:
     virtual ~ContentWriterBase() = default;
     ContentWriterBase(const ContentWriterBase& other) = default;
     ContentWriterBase(ContentWriterBase&& other) noexcept = default;
-    ContentWriterBase& operator=(const ContentWriterBase& other) = default;
-    ContentWriterBase& operator=(ContentWriterBase&& other) noexcept = default;
+    ContentWriterBase& operator=(const ContentWriterBase& other) = delete;
+    ContentWriterBase& operator=(ContentWriterBase&& other) noexcept = delete;
 
 protected:
     void WriteXString(bool atStreamStart);