Ticket #4248: save-iq-fix.patch

engines/scumm/script_v5.cpp

@@ -1017 +1017 @@
  */
 void ScummEngine_v5::updateIQPoints() {
         int seriesIQ;
+        // 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;
         int episodeIQStringSize;
-        byte *episodeIQString;
-        byte seriesIQString[73];
 
         // load string with IQ points given per puzzle in any savegame
         // IMPORTANT: the resource string STRINGID_IQ_SERIES is only valid while
@@ -1032 +1036 @@
         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;

engines/scumm/scumm.cpp

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