mirror of
https://github.com/zeldaret/ss
synced 2026-06-10 04:53:45 -04:00
Fix weak function order in d_sys.cpp & mark matching
This commit is contained in:
+1
-1
@@ -465,7 +465,7 @@ config.libs = [
|
||||
Object(Matching, "d/d_scene.cpp"),
|
||||
Object(NonMatching, "d/d_state.cpp"),
|
||||
Object(Matching, "d/d_stage_parse.cpp"),
|
||||
Object(NonMatching, "d/d_sys.cpp"),
|
||||
Object(Matching, "d/d_sys.cpp"),
|
||||
Object(NonMatching, "d/d_sys_init.cpp"),
|
||||
Object(Matching, "toBeSorted/arc_callback_handler.cpp"),
|
||||
Object(NonMatching, "d/d_video.cpp"),
|
||||
|
||||
@@ -103,6 +103,12 @@ public:
|
||||
return static_cast<SimpleAudioMgr *>(mAudioMgr);
|
||||
}
|
||||
|
||||
// Trick to fix weak function order in d_sys.cpp
|
||||
// https://github.com/zeldaret/ss/pull/305#issuecomment-4201728492
|
||||
void doInitialize() {
|
||||
initialize();
|
||||
}
|
||||
|
||||
public:
|
||||
/* 0x38 */ u32 mGraphicsFifoSize;
|
||||
/* 0x3C */ GXRenderModeObj *mRenderMode;
|
||||
|
||||
+1
-1
@@ -492,7 +492,7 @@ void dSys_c::create() {
|
||||
ms_configuration_p = &SysConfig;
|
||||
EGG::BaseSystem::mConfigData = &SysConfig;
|
||||
|
||||
ms_configuration_p->initialize();
|
||||
ms_configuration_p->doInitialize();
|
||||
|
||||
pRootHeapMem1 = EGG::BaseSystem::mConfigData->mRootHeapMem1;
|
||||
ms_RootHeapMem1 = mHeap::createExpHeap(-1, pRootHeapMem1, "dSys_c::RootHeapMEM1", 32, mHeap::OPT_4);
|
||||
|
||||
Reference in New Issue
Block a user