Merge branch 'main' into pr/17

2 files changed, 10 insertions, 11 deletions

diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h
index 0bd0b508..1740a1e4 100644
--- a/include/egg/core/eggHeap.h
+++ b/include/egg/core/eggHeap.h
@@ -18,10 +18,10 @@ class Allocator;
 
 struct HeapAllocArg {
     void *userArg; // 00
-    u32 size;    // 04
-    int align;   // 08
-    Heap *heap;  // 0C heap to allocate in
-    int another; // 10
+    u32 size;      // 04
+    int align;     // 08
+    Heap *heap;    // 0C heap to allocate in
+    int another;   // 10
 
     inline HeapAllocArg() : userArg(0), size(0), align(0), heap(nullptr) {}
 };
@@ -158,9 +158,6 @@ public:
     /* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 align);
     /* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc);
     /* 80495a90 */ void *operator new[](size_t size, u32 align);
-    /* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align);
-};
-
-} // namespace EGG
+    /* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, u32 align);
 
 #endif
diff --git a/include/egg/core/eggThread.h b/include/egg/core/eggThread.h
index 8895b95d..048cb88e 100644
--- a/include/egg/core/eggThread.h
+++ b/include/egg/core/eggThread.h
@@ -11,9 +11,9 @@ namespace EGG {
 class Thread {
 public: // vtable: 0x00 | 8056ea40
     /* 0x08 | 80496a60 */ virtual ~Thread();
-    /* 0x0C | 80496dd0 */ virtual void *run();
-    /* 0x10 | 800bd600 */ virtual void onEnter();
-    /* 0x14 | 800bd5f0 */ virtual void onExit();
+    /* 0x0C | 80496dd0 */ virtual void *run() { return nullptr; }
+    /* 0x10 | 800bd600 */ virtual void onEnter() {}
+    /* 0x14 | 800bd5f0 */ virtual void onExit() {}
 
 public:
     /* 0x04 */ Heap *mContainingHeap;
@@ -24,6 +24,8 @@ public:
     /* 0x34 */ void *mStackMemory;
     /* 0x38 */ u32 mStackSize;
     /* 0x3C */ Heap *mAllocatableHeap;
+    // TODO from the usage in eggThread this really looks like
+    // it's stashed thread that's restored when switching threads
     /* 0x40 */ Heap *mCurrentHeap;
     /* 0x44 */ nw4r::ut::Node mLink;