libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Patch from bug #2710315: INDY3/FOA: bug in patch for series IQ with ScummVM GUI

Browse Source 
svn-id: r39677
This commit is contained in:
Max Horn 2009-03-24 23:30:48 +00:00
parent 51751cd069
commit ee42d06a43
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/scumm/script_v5.cpp
View File

@ -1017,9 +1017,13 @@ void ScummEngine_v5::loadVars() {
*/
void ScummEngine_v5::updateIQPoints() {
int seriesIQ;
int episodeIQStringSize;
// IQString[0..72] corresponds to each puzzle's IQ.
// IQString[73] indicates that the IQ-file was loaded successfully and is always 0 when
// the IQ is calculated, hence it will be ignored here.
const int NUM_PUZZLES = 73;
byte seriesIQString[NUM_PUZZLES];
byte *episodeIQString;
byte seriesIQString[73];
int episodeIQStringSize;
// load string with IQ points given per puzzle in any savegame
// IMPORTANT: the resource string STRINGID_IQ_SERIES is only valid while
@ -1032,14 +1036,14 @@ void ScummEngine_v5::updateIQPoints() {
if (!episodeIQString)
return;
episodeIQStringSize = getResourceSize(rtString, STRINGID_IQ_EPISODE);
if (episodeIQStringSize < 73)
if (episodeIQStringSize < NUM_PUZZLES)
return;
// merge episode and series IQ strings and calculate series IQ
seriesIQ = 0;
// iterate over puzzles (each of the first 73 bytes corresponds to a puzzle's IQ)
for (int i = 0; i < 73 ; ++i) {
char puzzleIQ = seriesIQString[i];
// iterate over puzzles
for (int i = 0; i < NUM_PUZZLES ; ++i) {
byte puzzleIQ = seriesIQString[i];
// if puzzle is solved copy points to episode string
if (puzzleIQ > 0)
episodeIQString[i] = puzzleIQ;

3
engines/scumm/scumm.cpp
View File

@ -2083,7 +2083,8 @@ void ScummEngine::scummLoop_handleSaveLoad() {
}
void ScummEngine_v5::scummLoop_handleSaveLoad() {
byte saveLoad = (_saveLoadFlag != 0);
// copy saveLoadFlag as handleSaveLoad() resets it
byte saveLoad = _saveLoadFlag;
ScummEngine::scummLoop_handleSaveLoad();