preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-08 21:53:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16610 from unknownbrackets/state-fonts

Browse Source 
Font: Avoid late load on save state
This commit is contained in:
Henrik Rydgård
2023-01-04 10:25:40 +01:00
committed by GitHub
parent f7916b2f68 7ed238a0b7
commit fa22ec575d
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceFont.cpp
+16 -3
View File
@@ -317,7 +317,8 @@ public:
int numInternalFonts = (int)internalFonts.size();
Do(p, numInternalFonts);
if (numInternalFonts != (int)internalFonts.size()) {
// It's okay if numInternalFonts was zero and we've now loaded them.
if (numInternalFonts != (int)internalFonts.size() && numInternalFonts != 0) {
ERROR_LOG(SCEFONT, "Unable to load state: different internal font count.");
p.SetError(p.ERROR_FAILURE);
return;
@@ -329,6 +330,11 @@ public:
if (internalFont == -1) {
Do(p, font_);
} else if (p.mode == p.MODE_READ) {
if (internalFont < 0 || internalFont >= (int)internalFonts.size()) {
ERROR_LOG(SCEFONT, "Unable to load state: unexpected internal font index.");
p.SetError(p.ERROR_FAILURE);
return;
}
font_ = internalFonts[internalFont];
}
Do(p, handle_);
@@ -947,11 +953,18 @@ void __FontShutdown() {
}
void __FontDoState(PointerWrap &p) {
auto s = p.Section("sceFont", 1, 2);
auto s = p.Section("sceFont", 1, 3);
if (!s)
return;
__LoadInternalFonts();
bool needInternalFonts = true;
if (s >= 3) {
// If we loaded internal fonts, we need to load them when loading the state.
needInternalFonts = !internalFonts.empty();
Do(p, needInternalFonts);
}
if (needInternalFonts)
__LoadInternalFonts();
Do(p, fontLibList);
Do(p, fontLibMap);