diff options
Diffstat (limited to 'include/m')
| -rw-r--r-- | include/m/m_dvd.h | 5 | ||||
| -rw-r--r-- | include/m/m_heap.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h index 11890653..8045f220 100644 --- a/include/m/m_dvd.h +++ b/include/m/m_dvd.h @@ -69,7 +69,7 @@ public: u8 mCompressionType; }; -typedef bool (*dvdReadCallback)(void *); +typedef u32 (*dvdReadCallback)(void *); class mDvd_callback_c : public mDvd_command_c { public: @@ -78,10 +78,11 @@ public: virtual u32 execute() override; static mDvd_callback_c *create(dvdReadCallback cb, void *cbData); + static mDvd_callback_c *createOrFail(dvdReadCallback cb, void *cbData); dvdReadCallback mCallback; void *mCallbackData; - BOOL mSuccess; + u32 mCallbackResult; }; class mDvd_mountMemArchive_c : public mDvd_command_c { diff --git a/include/m/m_heap.h b/include/m/m_heap.h index 3cc53ff3..c6681bb6 100644 --- a/include/m/m_heap.h +++ b/include/m/m_heap.h @@ -32,7 +32,7 @@ public: } /* 802f12b0 */ mHeap(EGG::Heap *heap); /* 802f12f0 */ ~mHeap(); - /* 802f1350 */ static EGG::Heap *createHeap(size_t size, EGG::Heap *, const char *name); + /* 802f1350 */ static EGG::ExpHeap *createHeap(size_t size, EGG::Heap *, const char *name); /* 802f13d0 */ static void saveCurrentHeap(); /* 802f13e0 */ static void restoreCurrentHeap(); /* 802f1410 */ static EGG::FrmHeap *makeFrmHeapAndUpdate(size_t size, EGG::Heap *parentHeap, const char *name, @@ -56,7 +56,7 @@ public: static EGG::Heap *s_SavedCurrentHeap; static EGG::Heap *g_archiveHeap; static EGG::Heap *g_commandHeap; - static EGG::Heap *g_dylinkHeap; + static EGG::ExpHeap *g_dylinkHeap; static EGG::AssertHeap *g_assertHeap; static u8 g_DefaultGameHeapId; static const char *const s_GameHeapNames[4]; |