vlt: move the heap helpers into vltLayerMgrTask.cpp

The binary defines the HeapUtil.h helpers at the start of the
LayerMgrTask TU: their statics sit just before LayerMgrTask::sInstance.

(AI assisted using Claude Fable 5.1 and Claude Opus 5.5)

4 files changed, 8 insertions, 2 deletions

diff --git a/src/KingSystem/CMakeLists.txt b/src/KingSystem/CMakeLists.txt
index e70ac77a..5235f82f 100644
--- a/src/KingSystem/CMakeLists.txt
+++ b/src/KingSystem/CMakeLists.txt
@@ -17,6 +17,7 @@ add_subdirectory(Sound)
 add_subdirectory(System)
 add_subdirectory(Terrain)
 add_subdirectory(Utils)
+add_subdirectory(Volante)
 add_subdirectory(World)
 add_subdirectory(XLink)
 
diff --git a/src/KingSystem/Utils/CMakeLists.txt b/src/KingSystem/Utils/CMakeLists.txt
index e60e67e9..4bbf272d 100644
--- a/src/KingSystem/Utils/CMakeLists.txt
+++ b/src/KingSystem/Utils/CMakeLists.txt
@@ -75,7 +75,6 @@ target_sources(uking PRIVATE
   Debug.h
   FixedString.h
   HashUtil.h
-  HeapUtil.cpp
   HeapUtil.h
   InitTimeInfo.h
   IteratorUtil.h
diff --git a/src/KingSystem/Volante/CMakeLists.txt b/src/KingSystem/Volante/CMakeLists.txt
new file mode 100644
index 00000000..bb8583c9
--- /dev/null
+++ b/src/KingSystem/Volante/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(uking PRIVATE
+  vltLayerMgrTask.cpp
+)
diff --git a/src/KingSystem/Utils/HeapUtil.cpp b/src/KingSystem/Volante/vltLayerMgrTask.cpp
index 5a8ae4b4..5a9f26ad 100644
--- a/src/KingSystem/Utils/HeapUtil.cpp
+++ b/src/KingSystem/Volante/vltLayerMgrTask.cpp
@@ -1,7 +1,10 @@
-#include "KingSystem/Utils/HeapUtil.h"
 #include <heap/seadHeapMgr.h>
 #include <thread/seadThread.h>
+#include "KingSystem/Utils/HeapUtil.h"
 
+// The heap helpers declared in HeapUtil.h are defined at the start of this TU in the original
+// binary: they follow a static initializer, their statics sit right before LayerMgrTask::sInstance
+// and they are out-of-line.
 namespace ksys::util {
 
 // Name, layout and purpose unknown; this is stubbed in release builds