mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-06 18:02:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #233 from robojumper/arc-dvd-ret-cleanups

Browse Source 
Small status/result cleanups for arc managers
This commit is contained in:
robojumper
2025-09-13 10:05:17 +02:00
committed by GitHub
parent 8efc3f6de1 da63feb111
commit 342f867df2
19 changed files with 324 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/d_s_boot.cpp
+6 -6
View File
@@ -69,10 +69,10 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb1() {
}
sFPhaseBase::sFPhaseState dScBoot_c::cb2() {
if (OarcManager::GetInstance()->ensureAllEntriesLoaded()) {
if (OarcManager::GetInstance()->ensureAllEntriesLoaded() != D_ARC_RESULT_OK) {
return sFPhaseBase::PHASE_RETRY;
}
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded()) {
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded() != D_ARC_RESULT_OK) {
return sFPhaseBase::PHASE_RETRY;
}
@@ -104,7 +104,7 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb5() {
return sFPhaseBase::PHASE_RETRY;
}
}
if (mpDvdCallback->mStatus == 0) {
if (!mpDvdCallback->isDone()) {
return sFPhaseBase::PHASE_RETRY;
} else {
mpDvdCallback->do_delete();
@@ -271,11 +271,11 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb7() {
return sFPhaseBase::PHASE_RETRY;
}
if (OarcManager::GetInstance()->ensureAllEntriesLoaded()) {
if (OarcManager::GetInstance()->ensureAllEntriesLoaded() != D_ARC_RESULT_OK) {
return sFPhaseBase::PHASE_RETRY;
}
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded()) {
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded() != D_ARC_RESULT_OK) {
return sFPhaseBase::PHASE_RETRY;
}
@@ -341,7 +341,7 @@ dScBoot_c::strap_c::strap_c() {
bool dScBoot_c::strap_c::create() {
if (!field_0x4EC) {
if (LayoutArcManager::GetInstance()->ensureLoaded1(mArcName)) {
if (LayoutArcManager::GetInstance()->ensureLoaded1(mArcName) != D_ARC_RESULT_OK) {
return false;
}
void *data = LayoutArcManager::GetInstance()->getLoadedData(mArcName);