mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-26 23:47:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert workarounds for now

Browse Source
This commit is contained in:
robojumper
2024-05-01 15:53:07 +02:00
parent 152238c9ce
commit 47baaaf8ee
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m/m_heap.cpp
+4 -6
View File
@@ -5,8 +5,7 @@
namespace mHeap {
// Workaround because dtk won't cooperate with this file
u8 g_DefaultGameHeapId[8] = {1};
u8 g_DefaultGameHeapId = 1;
#define MIN_ALIGN 0x20
@@ -179,7 +178,7 @@ EGG::FrmHeap *makeFrmHeapAndUpdate(size_t size, EGG::Heap *parentHeap, const cha
}
int getDefaultGameHeapId() {
return g_DefaultGameHeapId[0];
return g_DefaultGameHeapId;
}
inline bool isValidHeapId(u32 id) {
@@ -199,7 +198,7 @@ EGG::ExpHeap *createGameHeap(int heapId, size_t size, EGG::Heap *parent) {
}
g_gameHeaps[heapId] = createHeap(size, parent, s_GameHeapNames[heapId]);
if (heapId == g_DefaultGameHeapId[0]) {
if (heapId == g_DefaultGameHeapId) {
g_gameHeaps[0] = g_gameHeaps[heapId];
}
return g_gameHeaps[heapId];
@@ -220,8 +219,7 @@ EGG::ExpHeap *createDylinkHeap(size_t size, EGG::Heap *parent) {
return g_dylinkHeap;
}
EGG::AssertHeap *createAssertHeap(EGG::Heap *parent) {
// Help how do I tell dtk about string length?
const char *name = "アサートヒープ(mHeap::assertHeap)\0\0\0\0\0\0";
const char *name = "アサートヒープ(mHeap::assertHeap)";
g_assertHeap = EGG::AssertHeap::create(EGG::AssertHeap::getSize(), parent);
g_assertHeap->mName = name;
return g_assertHeap;