Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-14 11:01:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

GameInfoCache: Some fixes for the icon loaded flag.

Browse Source 
Not really important but why not. Extracted from #17646
This commit is contained in:
Henrik Rydgård 2023-06-30 16:43:11 +02:00
parent fec1828be6
commit 667abd0a48
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UI/GameInfoCache.cpp
View File

@ -598,14 +598,12 @@ handleELF:
info_->ParseParamSFO();
if (info_->wantFlags & GAMEINFO_WANTBG) {
ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0.data, nullptr);
info_->pic0.dataLoaded = true;
ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1.data, nullptr);
info_->pic1.dataLoaded = true;
info_->pic0.dataLoaded = ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0.data, nullptr);
info_->pic1.dataLoaded = ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1.data, nullptr);
}
if (info_->wantFlags & GAMEINFO_WANTSND) {
ReadFileToString(&umd, "/PSP_GAME/SND0.AT3", &info_->sndFileData, nullptr);
info_->pic1.dataLoaded = true;
info_->sndDataLoaded = true;
}
}
@ -615,15 +613,16 @@ handleELF:
Path screenshot_png = GetSysDirectory(DIRECTORY_SCREENSHOT) / (info_->id + "_00000.png");
// Try using png/jpg screenshots first
if (File::Exists(screenshot_png))
File::ReadFileToString(false, screenshot_png, info_->icon.data);
info_->icon.dataLoaded = File::ReadFileToString(false, screenshot_png, info_->icon.data);
else if (File::Exists(screenshot_jpg))
File::ReadFileToString(false, screenshot_jpg, info_->icon.data);
info_->icon.dataLoaded = File::ReadFileToString(false, screenshot_jpg, info_->icon.data);
else {
DEBUG_LOG(LOADER, "Loading unknown.png because no icon was found");
ReadVFSToString("unknown.png", &info_->icon.data, &info_->lock);
info_->icon.dataLoaded = ReadVFSToString("unknown.png", &info_->icon.data, &info_->lock);
}
} else {
info_->icon.dataLoaded = true;
}
info_->icon.dataLoaded = true;
break;
}
@ -799,7 +798,7 @@ void GameInfoCache::SetupTexture(std::shared_ptr<GameInfo> &info, Draw::DrawCont
if (tex.texture) {
tex.timeLoaded = time_now_d();
} else {
ERROR_LOG(G3D, "Failed creating texture (%s)", info->GetTitle().c_str());
ERROR_LOG(G3D, "Failed creating texture (%s) from %d-byte file", info->GetTitle().c_str(), (int)tex.data.size());
}
}
if ((info->wantFlags & GAMEINFO_WANTBGDATA) == 0) {