summaryrefslogtreecommitdiff
path: root/src/egg/core/eggHeap.cpp
diff options
context:
space:
mode:
authorelijah-thomas774 <elijahthomas774@gmail.com>2024-05-12 16:04:01 -0400
committerelijah-thomas774 <elijahthomas774@gmail.com>2024-05-12 16:04:01 -0400
commit62e0778390f838cdb92f16b3582e2d76299ae8a5 (patch)
tree56f654268089544b7d3625b4cf60fc9fb087be97 /src/egg/core/eggHeap.cpp
parent94ec354dde88a3e5e9f3f5b23f3506f83f0beb80 (diff)
fixed up typedef for u32 and s32 from mistake long ago
Diffstat (limited to 'src/egg/core/eggHeap.cpp')
-rw-r--r--src/egg/core/eggHeap.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/egg/core/eggHeap.cpp b/src/egg/core/eggHeap.cpp
index a7a0dc7a..49234e0d 100644
--- a/src/egg/core/eggHeap.cpp
+++ b/src/egg/core/eggHeap.cpp
@@ -38,13 +38,16 @@ namespace EGG {
OSUnlockMutex(&sRootMutex);
}
-/* 80495560 */ void *Heap::alloc(size_t size, s32 align, Heap *heap) {
+/* 80495560 */ void *Heap::alloc(size_t size, int align, Heap *heap) {
Heap *currentHeap = sCurrentHeap;
Thread *thread = Thread::findThread(OSGetCurrentThread());
Heap *threadHeap = nullptr;
- if (thread != nullptr && (threadHeap = thread->mAllocatableHeap, threadHeap != nullptr)) {
- heap = threadHeap;
+ if (thread != nullptr) {
+ threadHeap = thread->mAllocatableHeap;
+ if (threadHeap != nullptr) {
+ heap = threadHeap;
+ }
}
if (sAllocatableHeap != nullptr) {
if (heap == nullptr) {