mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-13 13:56:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert some singleton access to getters

Browse Source
This commit is contained in:
robojumper
2025-03-09 21:15:53 +01:00
parent a507d8fc0a
commit 31c9b92798
70 changed files with 352 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toBeSorted/arc_callback_handler.cpp
+5 -5
View File
@@ -18,7 +18,7 @@ ArcCallbackHandler ArcCallbackHandler::sInstance;
extern "C" void FUN_804a7260(nw4r::g3d::ResMdl, const char *prefix);
void BindSystemModelsAndLighting(nw4r::g3d::ResFile file) {
nw4r::g3d::ResFile sysFile(OarcManager::sInstance->getMdlFromArc2("System"));
nw4r::g3d::ResFile sysFile(OarcManager::GetInstance()->getMdlFromArc2("System"));
if (sysFile.IsValid()) {
file.Bind(sysFile);
}
@@ -62,14 +62,14 @@ void ArcCallbackHandlerBase::CreateArcEntry(void *data, const char *path) {
char buf[64];
sscanf(oarcPath, "/oarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
OarcManager::sInstance->addEntryFromSuperArc(buf, data, nullptr);
OarcManager::GetInstance()->addEntryFromSuperArc(buf, data, nullptr);
mPrefix = oldPrefix;
} else if (mPrefix == NAME_RARC) {
SizedString<64> oarcPath = path;
char buf[64];
sscanf(oarcPath, "/rarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
CurrentStageArcManager::sInstance->addEntryFromSuperArc(buf, data);
CurrentStageArcManager::GetInstance()->addEntryFromSuperArc(buf, data);
mPrefix = oldPrefix;
}
}
@@ -80,14 +80,14 @@ void ArcCallbackHandlerBase::DestroyArcEntry(const char *path) {
char buf[64];
sscanf(oarcPath, "/oarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
OarcManager::sInstance->decrement(buf);
OarcManager::GetInstance()->decrement(buf);
mPrefix = oldPrefix;
} else if (mPrefix == NAME_RARC) {
SizedString<64> oarcPath = path;
char buf[64];
sscanf(oarcPath, "/rarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
CurrentStageArcManager::sInstance->decrement(buf);
CurrentStageArcManager::GetInstance()->decrement(buf);
mPrefix = oldPrefix;
}
}