summaryrefslogtreecommitdiff
path: root/src/d/d_dylink.cpp
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-03-02 20:45:04 +0100
committerGitHub <noreply@github.com>2025-03-02 14:45:04 -0500
commit3461afd2b89de4db997726ce99c9c188677e03c4 (patch)
tree8151e54423089dacd7b087a4df637325a019567d /src/d/d_dylink.cpp
parent43c997570411832521a039e1e2087e8efef3a9a9 (diff)
Fix mDvd createOrDie symbol (#122)
Diffstat (limited to 'src/d/d_dylink.cpp')
-rw-r--r--src/d/d_dylink.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_dylink.cpp b/src/d/d_dylink.cpp
index 70c4365d..55197434 100644
--- a/src/d/d_dylink.cpp
+++ b/src/d/d_dylink.cpp
@@ -284,7 +284,7 @@ err:
return false;
}
-u32 loadRelsArcCallback(void *arg) {
+void *loadRelsArcCallback(void *arg) {
EGG::Archive *arc = nullptr;
EGG::Heap *heap = DynamicModuleControl::sDylinkHeap;
@@ -297,10 +297,10 @@ u32 loadRelsArcCallback(void *arg) {
if (arc != nullptr) {
DynamicModuleControl::sArchive = arc;
}
- return (u32)arc;
+ return reinterpret_cast<void *>(arc);
}
-u32 dvdCallback(void *arg) {
+void *dvdCallback(void *arg) {
DynamicModuleControl::initialize(mHeap::g_dylinkHeap);
DynamicModuleControl::sRelsDir = relsDir;
DVDFileInfo info;
@@ -319,16 +319,16 @@ u32 dvdCallback(void *arg) {
do {
} while (!result);
Initialized = 1;
- return true;
+ return reinterpret_cast<void *>(true);
}
void initModule() {
initDylinkHeap(0x2bf, DYNAMIC_NAME_TABLE, 0x27c, mHeap::g_dylinkHeap);
- DVD = mDvd_callback_c::createOrFail(dvdCallback, mHeap::g_dylinkHeap);
+ DVD = mDvd_callback_c::createOrDie(dvdCallback, mHeap::g_dylinkHeap);
}
void initRelsArc() {
- DVD = mDvd_callback_c::createOrFail(loadRelsArcCallback, nullptr);
+ DVD = mDvd_callback_c::createOrDie(loadRelsArcCallback, nullptr);
}
bool destroy() {