diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2024-05-31 20:09:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 20:09:21 -0400 |
| commit | bc9eaa1ca985315386ceed621c9fb64fc88d4eac (patch) | |
| tree | 27ef7217bfdad5359aafc085f001ea7adda3e14a /src/m | |
| parent | 9d26f1bd6660eef16b2cbb94e1a20d67e81f4380 (diff) | |
| parent | 64f4aaa260703769a598a87cddb4003d36869d88 (diff) | |
Merge pull request #46 from robojumper/d_dylink
d_dylink for the most part
Diffstat (limited to 'src/m')
| -rw-r--r-- | src/m/m_dvd.cpp | 8 | ||||
| -rw-r--r-- | src/m/m_heap.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/m/m_dvd.cpp b/src/m/m_dvd.cpp index 82fce847..21fed247 100644 --- a/src/m/m_dvd.cpp +++ b/src/m/m_dvd.cpp @@ -330,7 +330,7 @@ mDvd_callback_c::~mDvd_callback_c() {} mDvd_callback_c::mDvd_callback_c(dvdReadCallback cb, void *cbData) { mCallback = cb; mCallbackData = cbData; - mSuccess = false; + mCallbackResult = 0; } /* 802ef5d0 */ @@ -343,7 +343,7 @@ mDvd_callback_c *mDvd_callback_c::create(dvdReadCallback cb, void *cbData) { } /** 802ef650 */ -extern "C" mDvd_callback_c *fn_802EF650(dvdReadCallback cb, void *cbData) { +mDvd_callback_c *mDvd_callback_c::createOrFail(dvdReadCallback cb, void *cbData) { mDvd_callback_c *cmd = mDvd_callback_c::create(cb, cbData); while (!cmd) {} return cmd; @@ -351,9 +351,9 @@ extern "C" mDvd_callback_c *fn_802EF650(dvdReadCallback cb, void *cbData) { /** 802ef680 */ u32 mDvd_callback_c::execute() { - mSuccess = (mCallback)(mCallbackData); + mCallbackResult = (mCallback)(mCallbackData); waitDone(); - return (bool)mSuccess; + return (bool)mCallbackResult; } /** 802ef6e0 */ diff --git a/src/m/m_heap.cpp b/src/m/m_heap.cpp index 6ab9cc12..ca18857f 100644 --- a/src/m/m_heap.cpp +++ b/src/m/m_heap.cpp @@ -11,7 +11,7 @@ EGG::Heap *mHeap::g_gameHeaps[4]; EGG::Heap *mHeap::s_SavedCurrentHeap; EGG::Heap *mHeap::g_archiveHeap; EGG::Heap *mHeap::g_commandHeap; -EGG::Heap *mHeap::g_dylinkHeap; +EGG::ExpHeap *mHeap::g_dylinkHeap; EGG::AssertHeap *mHeap::g_assertHeap; const char *const mHeap::s_GameHeapNames[4] = { 0, @@ -144,7 +144,7 @@ mHeap::~mHeap() { heap->becomeCurrentHeap(); } -EGG::Heap *mHeap::createHeap(size_t size, EGG::Heap *block, const char *name) { +EGG::ExpHeap *mHeap::createHeap(size_t size, EGG::Heap *block, const char *name) { EGG::ExpHeap *heap = EGG::ExpHeap::create(size, block, 4); if (heap != nullptr) { heap->setGroupID(0); |