mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Stop using PIC0 as a PIC1 replacement. Fix assorted PIC0 issues.
This commit is contained in:
1 parent
7bdf7f1621
commit
d93178bd13
3 files changed
+4
-6
No files matched your search
+2
-4
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user