From f2aaeac6c68dc126286035db3e6da43bacdd01e1 Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Sun, 5 Apr 2026 17:45:43 +0100
Subject: [PATCH] Broken but too much work to fix

---
 include/d/d_heap.h | 20 ++++++++++----------
 include/d/d_sys.h  |  2 +-
 src/d/d_sys.cpp    | 10 +++++++++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/include/d/d_heap.h b/include/d/d_heap.h
index 6a6bb1f0..8809144b 100644
--- a/include/d/d_heap.h
+++ b/include/d/d_heap.h
@@ -3,20 +3,20 @@
 
 #include "egg/core/eggExpHeap.h"
 
-class dHeap : public EGG::Heap {
+class dHeap {
 public:
     EGG::ExpHeap *heap;
 
 public:
-    static dHeap *work1Heap;
-    static dHeap *work2Heap;
-    static dHeap *workExHeap;
-    static dHeap *layoutHeap;
-    static dHeap *layoutExHeap;
-    static dHeap *layoutEx2Heap;
-    static dHeap *layoutResHeap;
-    static dHeap *fontHeap;
-    static dHeap *HBMHeap;
+    static dHeap work1Heap;
+    static dHeap work2Heap;
+    static dHeap workExHeap;
+    static dHeap layoutHeap;
+    static dHeap layoutExHeap;
+    static dHeap layoutEx2Heap;
+    static dHeap layoutResHeap;
+    static dHeap fontHeap;
+    static dHeap HBMHeap;
 
 public:
     EGG::ExpHeap *init(const char *name, size_t size, EGG::Heap *parent);
diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index 2caf7e36..61135bc4 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -30,7 +30,7 @@ public:
     static void create();
     static void execute();
 
-private:
+public:
     static System *ms_configuration_p;
     static EGG::Heap *ms_RootHeapMem1;
     static EGG::Heap *ms_RootHeapMem2;
diff --git a/src/d/d_sys.cpp b/src/d/d_sys.cpp
index 26778af4..8e0cd984 100644
--- a/src/d/d_sys.cpp
+++ b/src/d/d_sys.cpp
@@ -203,7 +203,7 @@ void dSys_c::create() {
     dReset::Manage_c::CreateInstance(heapMem2);
 
     dHeap::createHBMHeap(0x180000, heapMem2);
-    dHbm::Manage_c::CreateInstance(dHeap::HBMHeap);
+    dHbm::Manage_c::CreateInstance(dHeap::HBMHeap.heap);
 
     initAudioMgr(heapMem1);
 
@@ -344,3 +344,11 @@ void dSys_c::execute() {
 
     endFrame();
 }
+
+namespace dSystem {
+
+void fixHeaps() {
+
+}
+
+}