Ticket #7547: iqpoints2.diff

engines/scumm/scumm.cpp

@@ -1704 +1704 @@
                 }
         }
 
+        if (_game.id == GID_INDY3) {
+                saveLoadIQPoints(true);
+        }
+
         return 0;
 }
 

engines/scumm/scumm.h

@@ -603 +603 @@
         bool _saveTemporaryState;
         char _saveLoadName[32];
 
+        void saveLoadIQPoints(bool save);
+
         bool saveState(int slot, bool compat);
         bool loadState(int slot, bool compat);
         virtual void saveOrLoad(Serializer *s);

engines/scumm/saveload.cpp

@@ -69 +69 @@
 
 #define INFOSECTION_VERSION 2
 
+void ScummEngine::saveLoadIQPoints(bool save) {
+        assert(_game.id == GID_INDY3);
+
+        // Save/load the "series" IQ points for Indy3. See FR #1666521 for
+        // some explanations as to why/how this code works.
+        // We store string 7, but load string 9 (this is on purpose).
+        char iqPointsFilename[32];
+        sprintf(iqPointsFilename, "%s.___", _targetName.c_str());
+
+        if (save) {
+                Common::OutSaveFile *file = _saveFileMan->openForSaving(iqPointsFilename);
+                if (file != NULL) {
+                        int size = getResourceSize(rtString, 7);
+                        byte *ptr = getResourceAddress(rtString, 7);
+                        file->write(ptr, size);
+                        delete file;
+                }
+        } else {
+                Common::InSaveFile *file = _saveFileMan->openForLoading(iqPointsFilename);
+                if (file != NULL) {
+                        int len = file->size();
+                        byte *ptr9 = (byte *)malloc(len);
+                        len = file->read(ptr9, len);    // Read the future content of string 9
+                        loadPtrToResource(rtString, 9, ptr9);
+
+                        byte *ptr7 = getResourceAddress(rtString, 7);
+
+                        int seriesIQ = 0;
+                        for (int i = 0; i <= 73; ++i) {
+                                if (ptr9[i])
+                                        ptr7[i] = ptr9[i];
+                                seriesIQ += ptr7[i];
+                        }
+                        // TODO: Set var 245 to seriesIQ ???
+
+                        free(ptr9);
+                        delete file;
+                }
+        }
+}
+
 void ScummEngine::requestSave(int slot, const char *name, bool temporary) {
         _saveLoadSlot = slot;
         _saveTemporaryState = temporary;
@@ -1108 +1149 @@
 
         s->saveLoadArrayOf(_bitVars, _numBitVariables >> 3, 1, sleByte);
 
+        if (_game.id == GID_INDY3) {
+                saveLoadIQPoints(s->isSaving());
+        }
 
         //
         // Save/load a list of the locked objects

engines/scumm/script_v5.cpp

@@ -871 +871 @@
 void ScummEngine_v5::saveVars() {
         int a, b;
 
-        // FIXME: This opcode is currently a stub. It is needed for at least two things:
+        // This opcode is a stub, on purpose. As far as we know it is used 
+        // for precisely two things.
         // * storing save game names in Indy 3 (and maybe others)
         // * storing the global IQ (Indy Quotient) in Indy 3
         // The former is not so important as we have our own save system, but the
         // latter one of course is a desirable feature.
-        // So implementing this would be nice indeed. Not sure what the filename
-        // should be -- either base it on the target name, or base it on the gameid.
-        // Both approaches have their merits, though.
+        // However, there are at least two problems: First off, it's questionable
+        // whether using the filename passed to this opcode is a good idea.
+        // It might clash with others, and is neither target nor gameid specific,
+        // which could lead to conflicts.
+        // Secondly, the scripts calling this opcode are only run when using the 
+        // built-in save/load dialog of Indy3, which we don't.
+        //
+        // Hence, instead of all this, we store the relevant strings (7 resp. 9)
+        // ourselves with custom code in ScummEngine::saveOrLoad().
 
         while ((_opcode = fetchScriptByte()) != 0) {
                 switch (_opcode & 0x1F) {
@@ -911 +918 @@
 void ScummEngine_v5::loadVars() {
         int a, b;
 
-        // FIXME: See ScummEngine_v5::saveVars
+        // See ScummEngine_v5::saveVars for an explanation of this opcode and
+        // why it is only a stub.
 
-//      Common::hexdump(_scriptPointer, 64);
         while ((_opcode = fetchScriptByte()) != 0) {
                 switch (_opcode & 0x1F) {
                 case 0x01: // read a range of variables
@@ -1985 +1992 @@
                         file = _saveFileMan->openForLoading(filename);
                         if (file != NULL) {
                                 byte *ptr;
-                                int len = 256, cnt = 0;
+                                int len = file->size();
                                 ptr = (byte *)malloc(len);
-                                while (ptr) {
-                                        int r = file->read(ptr + cnt, len - cnt);
-                                        cnt += r;
-                                        if (cnt < len)
-                                                break;
-                                        len *= 2;
-                                        ptr = (byte *)realloc(ptr, len);
-                                }
-                                ptr[cnt] = '\0';
+                                len = file->read(ptr, len);
                                 loadPtrToResource(rtString, a, ptr);
                                 free(ptr);
                                 delete file;
@@ -2303 +2302 @@
         _opcode = fetchScriptByte();
         switch (_opcode & 0x1F) {
         case 1:                                                                                 /* loadstring */
-                loadPtrToResource(rtString, getVarOrDirectByte(PARAM_1), NULL);
+                a = getVarOrDirectByte(PARAM_1);
+                loadPtrToResource(rtString, a, NULL);
                 break;
         case 2:                                                                                 /* copystring */
                 a = getVarOrDirectByte(PARAM_1);