From 3c6acf37dd9e80e47c6dd5b280759685c6d4ad89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 2 Aug 2025 09:43:55 +0200 Subject: [PATCH 1/4] Split loading of PIC0/PIC1 (don't need PIC0 most of the time) --- Common/LoongArch64Emitter.cpp | 4 ++-- UI/EmuScreen.cpp | 4 ++-- UI/GameInfoCache.cpp | 17 ++++++++++++----- UI/GameInfoCache.h | 11 ++++++----- UI/GameScreen.cpp | 8 ++++---- UI/MainScreen.cpp | 4 ++-- UI/MiscScreens.cpp | 8 ++++---- 7 files changed, 32 insertions(+), 24 deletions(-) diff --git a/Common/LoongArch64Emitter.cpp b/Common/LoongArch64Emitter.cpp index b4f630ce63..fda163c45c 100644 --- a/Common/LoongArch64Emitter.cpp +++ b/Common/LoongArch64Emitter.cpp @@ -1834,7 +1834,7 @@ void LoongArch64Emitter::SetRegToImmediate(LoongArch64Reg rd, uint64_t value) { return; } - if (svalue <= 0x7fffffffl && svalue >= -0x80000000l) { + if (svalue <= 0x7fffffffll && svalue >= -0x80000000ll) { // Use lu12i.w/ori to load 32-bits immediate. LU12I_W(rd, (s32)((svalue & 0xffffffff) >> 12)); ORI(rd, rd, (s16)(svalue & 0xFFF)); @@ -6328,4 +6328,4 @@ void LoongArch64CodeBlock::PoisonMemory(int offset) { *ptr++ = 0x002a0000; } -}; \ No newline at end of file +}; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 25f639ac81..ed552b2804 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -1177,11 +1177,11 @@ public: void Draw(UIContext &dc) override { // Should only be called when visible. - std::shared_ptr ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath_, GameInfoFlags::BG); + std::shared_ptr ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath_, GameInfoFlags::PIC1); dc.Flush(); // PIC1 is the loading image, so let's only draw if it's available. - if (ginfo->Ready(GameInfoFlags::BG) && ginfo->pic1.texture) { + if (ginfo->Ready(GameInfoFlags::PIC1) && ginfo->pic1.texture) { Draw::Texture *texture = ginfo->pic1.texture; if (texture) { dc.GetDrawContext()->BindTexture(0, texture); diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 73f1e071a8..c683612fc6 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -604,7 +604,7 @@ public: info_->icon.dataLoaded = true; } - if (flags_ & GameInfoFlags::BG) { + if (flags_ & GameInfoFlags::PIC0) { if (pbp.GetSubFileSize(PBP_PIC0_PNG) > 0) { std::string data; pbp.GetSubFileAsString(PBP_PIC0_PNG, &data); @@ -612,6 +612,8 @@ public: info_->pic0.data = std::move(data); info_->pic0.dataLoaded = true; } + } + if (flags_ & GameInfoFlags::PIC1) { if (pbp.GetSubFileSize(PBP_PIC1_PNG) > 0) { std::string data; pbp.GetSubFileAsString(PBP_PIC1_PNG, &data); @@ -679,7 +681,7 @@ handleELF: ReadFileToString(&umd, "/ICON0.PNG", &info_->icon.data, &info_->lock); info_->icon.dataLoaded = true; } - if (flags_ & GameInfoFlags::BG) { + if (flags_ & GameInfoFlags::PIC1) { ReadFileToString(&umd, "/PIC1.PNG", &info_->pic1.data, &info_->lock); info_->pic1.dataLoaded = true; } @@ -735,9 +737,11 @@ handleELF: ReadFileToString(&umd, "/PSP_GAME/ICON0.PNG", &info_->icon.data, &info_->lock); info_->icon.dataLoaded = true; } - if (flags_ & GameInfoFlags::BG) { + if (flags_ & GameInfoFlags::PIC0) { ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0.data, &info_->lock); info_->pic0.dataLoaded = true; + } + if (flags_ & GameInfoFlags::PIC1) { ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1.data, &info_->lock); info_->pic1.dataLoaded = true; } @@ -787,8 +791,11 @@ handleELF: } } - if (flags_ & GameInfoFlags::BG) { + if (flags_ & GameInfoFlags::PIC0) { info_->pic0.dataLoaded = ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0.data, &info_->lock); + } + + if (flags_ & GameInfoFlags::PIC1) { info_->pic1.dataLoaded = ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1.data, &info_->lock); } @@ -933,7 +940,7 @@ void GameInfoCache::FlushBGs() { iter->second->sndFileData.clear(); iter->second->sndDataLoaded = false; } - iter->second->hasFlags &= ~(GameInfoFlags::BG | GameInfoFlags::SND); + iter->second->hasFlags &= ~(GameInfoFlags::PIC0 | GameInfoFlags::PIC1 | GameInfoFlags::SND); } } diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h index 9a8d3dff2f..1fee1ce144 100644 --- a/UI/GameInfoCache.h +++ b/UI/GameInfoCache.h @@ -42,10 +42,11 @@ enum class GameInfoFlags { FILE_TYPE = 0x01, // Don't need to specify this, always included. PARAM_SFO = 0x02, ICON = 0x04, - BG = 0x08, - SND = 0x10, - SIZE = 0x20, - UNCOMPRESSED_SIZE = 0x40, + PIC1 = 0x08, + PIC0 = 0x10, + SND = 0x20, + SIZE = 0x40, + UNCOMPRESSED_SIZE = 0x80, }; ENUM_CLASS_BITOPS(GameInfoFlags); @@ -150,7 +151,7 @@ public: IdentifiedFileType fileType; bool hasConfig = false; - // Pre read the data, create a texture the next time (GL thread..) + // Pre read the data, create a texture the next time GameInfoTex icon; GameInfoTex pic0; GameInfoTex pic1; diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 280ae7cb22..57ea96e5e7 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -96,7 +96,7 @@ void GameScreen::update() { } void GameScreen::CreateViews() { - std::shared_ptr info = g_gameInfoCache->GetInfo(NULL, gamePath_, GameInfoFlags::PARAM_SFO | GameInfoFlags::ICON | GameInfoFlags::BG); + std::shared_ptr info = g_gameInfoCache->GetInfo(NULL, gamePath_, GameInfoFlags::PARAM_SFO | GameInfoFlags::ICON | GameInfoFlags::PIC1); auto di = GetI18NCategory(I18NCat::DIALOG); auto ga = GetI18NCategory(I18NCat::GAME); @@ -349,7 +349,7 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { Draw::DrawContext *draw = screenManager()->getDrawContext(); - std::shared_ptr info = g_gameInfoCache->GetInfo(draw, gamePath_, GameInfoFlags::BG | GameInfoFlags::SIZE | GameInfoFlags::UNCOMPRESSED_SIZE); + std::shared_ptr info = g_gameInfoCache->GetInfo(draw, gamePath_, GameInfoFlags::PIC1 | GameInfoFlags::SIZE | GameInfoFlags::UNCOMPRESSED_SIZE); if (tvTitle_) { tvTitle_->SetText(info->GetTitle()); @@ -613,8 +613,8 @@ void SetBackgroundPopupScreen::CreatePopupContents(UI::ViewGroup *parent) { void SetBackgroundPopupScreen::update() { PopupScreen::update(); - std::shared_ptr info = g_gameInfoCache->GetInfo(nullptr, gamePath_, GameInfoFlags::BG); - if (status_ == Status::PENDING && info->Ready(GameInfoFlags::BG)) { + std::shared_ptr info = g_gameInfoCache->GetInfo(nullptr, gamePath_, GameInfoFlags::PIC1); + if (status_ == Status::PENDING && info->Ready(GameInfoFlags::PIC1)) { GameInfoTex *pic = nullptr; if (info->pic1.dataLoaded && info->pic1.data.size()) { pic = &info->pic1; diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 5f1dc14963..d6648df1ce 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1449,12 +1449,12 @@ bool MainScreen::DrawBackgroundFor(UIContext &dc, const Path &gamePath, float pr std::shared_ptr ginfo; if (!gamePath.empty()) { - ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath, GameInfoFlags::BG); + ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath, GameInfoFlags::PIC1); // Loading texture data may bind a texture. dc.RebindTexture(); // Let's not bother if there's no picture. - if (!ginfo->Ready(GameInfoFlags::BG) || (!ginfo->pic1.texture && !ginfo->pic0.texture)) { + if (!ginfo->Ready(GameInfoFlags::PIC1) || (!ginfo->pic1.texture && !ginfo->pic0.texture)) { return false; } } else { diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index cc8cb00d32..80b2202453 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -246,7 +246,7 @@ private: } std::shared_ptr ginfo = GetInfo(dc, index); - if (ginfo && !ginfo->Ready(GameInfoFlags::BG)) { + if (ginfo && !ginfo->Ready(GameInfoFlags::PIC1)) { // Wait for it to load. It might be the next one. break; } @@ -267,7 +267,7 @@ private: const auto recentIsos = g_recentFiles.GetRecentFiles(); if (index >= (int)recentIsos.size()) return std::shared_ptr(); - return g_gameInfoCache->GetInfo(dc.GetDrawContext(), Path(recentIsos[index]), GameInfoFlags::BG); + return g_gameInfoCache->GetInfo(dc.GetDrawContext(), Path(recentIsos[index]), GameInfoFlags::PIC1); } static void DrawTex(UIContext &dc, std::shared_ptr &ginfo, float amount) { @@ -488,10 +488,10 @@ void DrawGameBackground(UIContext &dc, const Path &gamePath, float x, float y, f std::shared_ptr ginfo; if (!gamePath.empty()) { - ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath, GameInfoFlags::BG); + ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath, GameInfoFlags::PIC1); } - GameInfoTex *pic = (ginfo && ginfo->Ready(GameInfoFlags::BG)) ? ginfo->GetBGPic() : nullptr; + GameInfoTex *pic = (ginfo && ginfo->Ready(GameInfoFlags::PIC1)) ? ginfo->GetBGPic() : nullptr; if (pic) { dc.GetDrawContext()->BindTexture(0, pic->texture); uint32_t color = whiteAlpha(ease((time_now_d() - pic->timeLoaded) * 3)) & 0xFFc0c0c0; From 7bdf7f16215abc045c4e21f9d184b40e7d3ece06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 2 Aug 2025 10:06:15 +0200 Subject: [PATCH 2/4] Squeeze in PIC0 on the game info screen in a hacky way --- UI/GameScreen.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 57ea96e5e7..ff1400705e 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -96,7 +96,7 @@ void GameScreen::update() { } void GameScreen::CreateViews() { - std::shared_ptr info = g_gameInfoCache->GetInfo(NULL, gamePath_, GameInfoFlags::PARAM_SFO | GameInfoFlags::ICON | GameInfoFlags::PIC1); + std::shared_ptr info = g_gameInfoCache->GetInfo(NULL, gamePath_, GameInfoFlags::PARAM_SFO | GameInfoFlags::ICON | GameInfoFlags::PIC0 | GameInfoFlags::PIC1); auto di = GetI18NCategory(I18NCat::DIALOG); auto ga = GetI18NCategory(I18NCat::GAME); @@ -347,12 +347,20 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { auto ga = GetI18NCategory(I18NCat::GAME); - Draw::DrawContext *draw = screenManager()->getDrawContext(); + UIContext &dc = *screenManager()->getUIContext(); + Draw::DrawContext *draw = dc.GetDrawContext(); + + float maxY = 0; + // NOTE: This won't be correct the first frame. + auto updateMaxY = [&](UI::View *v) { + maxY = std::max(maxY, v->GetBounds().y2()); + }; std::shared_ptr info = g_gameInfoCache->GetInfo(draw, gamePath_, GameInfoFlags::PIC1 | GameInfoFlags::SIZE | GameInfoFlags::UNCOMPRESSED_SIZE); if (tvTitle_) { tvTitle_->SetText(info->GetTitle()); + updateMaxY(tvTitle_); } if (info->Ready(GameInfoFlags::SIZE | GameInfoFlags::UNCOMPRESSED_SIZE)) { @@ -364,6 +372,7 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { snprintf(temp + len, sizeof(temp) - len, " (%s: %s)", ga->T_cstr("Uncompressed"), NiceSizeFormat(info->gameSizeUncompressed).c_str()); } tvGameSize_->SetText(temp); + updateMaxY(tvGameSize_); } if (tvSaveDataSize_) { if (info->saveDataSize > 0) { @@ -372,12 +381,14 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { } else { tvSaveDataSize_->SetVisibility(UI::V_GONE); } + updateMaxY(tvSaveDataSize_); } if (info->installDataSize > 0 && tvInstallDataSize_) { snprintf(temp, sizeof(temp), "%s: %1.2f %s", ga->T_cstr("InstallData"), (float) (info->installDataSize) / 1024.f / 1024.f, ga->T_cstr("MB")); tvInstallDataSize_->SetText(temp); tvInstallDataSize_->SetVisibility(UI::V_VISIBLE); } + updateMaxY(tvInstallDataSize_); } if (tvRegion_) { @@ -386,6 +397,7 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { } else { tvRegion_->SetText(ga->T(GameRegionToString(info->region))); } + updateMaxY(tvRegion_); } if (tvPlayTime_) { @@ -394,6 +406,7 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { tvPlayTime_->SetText(str); tvPlayTime_->SetVisibility(UI::V_VISIBLE); } + updateMaxY(tvPlayTime_); } if (tvCRC_ && Reporting::HasCRC(gamePath_)) { @@ -431,6 +444,9 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { // tvVerified_->SetLevel(NoticeLevel::WARN); tvVerified_->SetVisibility(UI::V_GONE); } + + updateMaxY(tvCRC_); + updateMaxY(tvVerified_); } else if (!isHomebrew_) { GameDBInfo dbInfo; if (tvVerified_) { @@ -458,11 +474,13 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { tvVerified_->SetLevel(NoticeLevel::INFO); } } + updateMaxY(tvVerified_); } } if (tvID_) { tvID_->SetText(ReplaceAll(info->id_version, "_", " v")); + updateMaxY(tvID_); } if (!info->id.empty()) { @@ -484,6 +502,44 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { choice->SetVisibility(UI::V_VISIBLE); } } + + if (info->Ready(GameInfoFlags::PIC0)) { + // Draw PIC0 as an overlay. + + bool draw = true; + + const float w = dc.GetBounds().w - 500; + const float h = w * (info->pic0.texture->Height() / (float)info->pic0.texture->Width()); + + // Bottom align the image. + Bounds bounds(180, dc.GetBounds().h - h - 10, w, h); + + maxY += 20; + + if (bounds.y < maxY) { + // Recalculate. + bounds.h = dc.GetBounds().h - 10 - maxY; + if (bounds.h < 0) { + // let's not draw it. + draw = false; + } + bounds.w = bounds.h * (info->pic0.texture->Width() / (float)info->pic0.texture->Height()); + bounds.y = dc.GetBounds().h - 10 - bounds.h; + } + + if (draw) { + // draw a dark rectangle behind the image. + dc.FillRect(UI::Drawable(0x80000000), bounds); + + dc.Flush(); + + dc.GetDrawContext()->BindTexture(0, info->pic0.texture); + uint32_t color = 0xFFFFFFFF; + dc.Draw()->DrawTexRect(bounds, 0, 0, 1, 1, color); + dc.Flush(); + dc.Begin(); + } + } return flags; } From d93178bd137afe9316f45a2fa92c55fe1af5d82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 2 Aug 2025 11:23:52 +0200 Subject: [PATCH 3/4] Stop using PIC0 as a PIC1 replacement. Fix assorted PIC0 issues. --- UI/GameScreen.cpp | 6 ++---- UI/MainScreen.cpp | 2 +- UI/MiscScreens.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index ff1400705e..a40abdfe99 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -491,7 +491,7 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { if (info->saveDataSize) { btnDeleteSaveData_->SetVisibility(UI::V_VISIBLE); } - if (info->pic0.texture || info->pic1.texture) { + if (info->pic1.texture) { btnSetBackground_->SetVisibility(UI::V_VISIBLE); } } @@ -503,7 +503,7 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { } } - if (info->Ready(GameInfoFlags::PIC0)) { + if (info->Ready(GameInfoFlags::PIC0) && info->pic0.texture) { // Draw PIC0 as an overlay. bool draw = true; @@ -674,8 +674,6 @@ void SetBackgroundPopupScreen::update() { GameInfoTex *pic = nullptr; if (info->pic1.dataLoaded && info->pic1.data.size()) { pic = &info->pic1; - } else if (info->pic0.dataLoaded && info->pic0.data.size()) { - pic = &info->pic0; } if (pic) { diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index d6648df1ce..950123ae4b 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1454,7 +1454,7 @@ bool MainScreen::DrawBackgroundFor(UIContext &dc, const Path &gamePath, float pr dc.RebindTexture(); // Let's not bother if there's no picture. - if (!ginfo->Ready(GameInfoFlags::PIC1) || (!ginfo->pic1.texture && !ginfo->pic0.texture)) { + if (!ginfo->Ready(GameInfoFlags::PIC1) || !ginfo->pic1.texture) { return false; } } else { diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 80b2202453..8e489904ea 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -250,7 +250,7 @@ private: // Wait for it to load. It might be the next one. break; } - if (ginfo && (ginfo->pic1.texture || ginfo->pic0.texture)) { + if (ginfo && ginfo->pic1.texture) { nextIndex_ = index; nextT_ = t + INTERVAL; break; From eb5c98cd07fd338f53a147e8138dab8871d97bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 2 Aug 2025 23:02:36 +0200 Subject: [PATCH 4/4] Don't use PIC0 as background if PIC1 is missing (actually this time). Remove dark background. --- UI/GameInfoCache.h | 4 +--- UI/GameScreen.cpp | 3 --- UI/MainScreen.cpp | 2 +- UI/MiscScreens.cpp | 4 ++-- UI/SavedataScreen.cpp | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h index 1fee1ce144..76f7738a5c 100644 --- a/UI/GameInfoCache.h +++ b/UI/GameInfoCache.h @@ -121,11 +121,9 @@ public: pendingFlags &= ~flags; } - GameInfoTex *GetBGPic() { + GameInfoTex *GetPIC1() { if (pic1.texture) return &pic1; - if (pic0.texture) - return &pic0; return nullptr; } diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index a40abdfe99..31c6ea3018 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -528,9 +528,6 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) { } if (draw) { - // draw a dark rectangle behind the image. - dc.FillRect(UI::Drawable(0x80000000), bounds); - dc.Flush(); dc.GetDrawContext()->BindTexture(0, info->pic0.texture); diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 950123ae4b..69055644d3 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1461,7 +1461,7 @@ bool MainScreen::DrawBackgroundFor(UIContext &dc, const Path &gamePath, float pr return false; } - auto pic = ginfo->GetBGPic(); + auto pic = ginfo->GetPIC1(); Draw::Texture *texture = pic ? pic->texture : nullptr; uint32_t color = whiteAlpha(ease(progress)) & 0xFFc0c0c0; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 8e489904ea..b2f1f87383 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -273,7 +273,7 @@ private: static void DrawTex(UIContext &dc, std::shared_ptr &ginfo, float amount) { if (!ginfo || amount <= 0.0f) return; - GameInfoTex *pic = ginfo->GetBGPic(); + GameInfoTex *pic = ginfo->GetPIC1(); if (!pic) return; @@ -491,7 +491,7 @@ void DrawGameBackground(UIContext &dc, const Path &gamePath, float x, float y, f ginfo = g_gameInfoCache->GetInfo(dc.GetDrawContext(), gamePath, GameInfoFlags::PIC1); } - GameInfoTex *pic = (ginfo && ginfo->Ready(GameInfoFlags::PIC1)) ? ginfo->GetBGPic() : nullptr; + GameInfoTex *pic = (ginfo && ginfo->Ready(GameInfoFlags::PIC1)) ? ginfo->GetPIC1() : nullptr; if (pic) { dc.GetDrawContext()->BindTexture(0, pic->texture); uint32_t color = whiteAlpha(ease((time_now_d() - pic->timeLoaded) * 3)) & 0xFFc0c0c0; diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 87f082a829..63cc707703 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -748,7 +748,7 @@ void GameIconView::Draw(UIContext &dc) { // Fade icon with the backgrounds. double loadTime = info->icon.timeLoaded; - auto pic = info->GetBGPic(); + auto pic = info->GetPIC1(); if (pic) { loadTime = std::max(loadTime, pic->timeLoaded); }