Ticket #8482: scummvm-autosave-define.patch

backends/dc/Makefile

@@ -10 +10 @@
 CC      = sh-elf-gcc -ml -m4-single-only
 CXX     = sh-elf-g++ -ml -m4-single-only
 CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
-DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DNOSERIAL
+DEFINES = -D__DC__ -DAUTOSAVE_OFF -DNONSTANDARD_PORT -DUSE_MAD -DNOSERIAL
 LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
 INCLUDES= -I./ -I$(srcdir) -I$(srcdir)/common -I$(ronindir)/include/
 LIBS    = -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
@@ -53 +53 @@
 
 dist : SCUMMVM.BIN plugins plugin_dist
 
+

queen/queen.cpp

@@ -231 +231 @@
                         _input->quickLoadReset();
                         loadGameState(0);
                 }
-                if (_system->getMillis() - _lastSaveTime >= AUTOSAVE_INTERVAL) {
-                        saveGameState(AUTOSAVE_SLOT, "Autosave");
-                        _lastSaveTime = _system->getMillis();
-                }
+                #if !defined(AUTOSAVE_OFF)
+                        if (_system->getMillis() - _lastSaveTime >= AUTOSAVE_INTERVAL) {
+                                saveGameState(AUTOSAVE_SLOT, "Autosave");
+                                _lastSaveTime = _system->getMillis();
+                        }
+                #endif
         }
         if (!_input->cutawayRunning()) {
                 if (checkPlayerInput) {

scumm/scumm.cpp

@@ -2339 +2339 @@
                 }
         }
 
-        // Trigger autosave all 5 minutes.
-        if (!_saveLoadFlag && _system->getMillis() > _lastSaveTime + 5 * 60 * 1000) {
-                _saveLoadSlot = 0;
-                sprintf(_saveLoadName, "Autosave %d", _saveLoadSlot);
-                _saveLoadFlag = 1;
-                _saveTemporaryState = false;
-        }
+        #if !defined(AUTOSAVE_OFF)
+                // Trigger autosave all 5 minutes.
+                if (!_saveLoadFlag && _system->getMillis() > _lastSaveTime + 5 * 60 * 1000) {
+                        _saveLoadSlot = 0;
+                        sprintf(_saveLoadName, "Autosave %d", _saveLoadSlot);
+                        _saveLoadFlag = 1;
+                        _saveTemporaryState = false;
+                }
+        #endif
 
         if (VAR_GAME_LOADED != 0xFF)
                 VAR(VAR_GAME_LOADED) = 0;

sky/sky.cpp

@@ -240 +240 @@
 
                 int32 frameTime = (int32)_system->getMillis();
 
-                if (_system->getMillis() - _lastSaveTime > 5 * 60 * 1000) {
-                        if (_skyControl->loadSaveAllowed()) {
-                                _lastSaveTime = _system->getMillis();
-                                _skyControl->doAutoSave();
-                        } else
-                                _lastSaveTime += 30 * 1000; // try again in 30 secs
-                }
+                #if !defined(AUTOSAVE_OFF)
+                        if (_system->getMillis() - _lastSaveTime > 5 * 60 * 1000) {
+                                if (_skyControl->loadSaveAllowed()) {
+                                        _lastSaveTime = _system->getMillis();
+                                        _skyControl->doAutoSave();
+                                } else
+                                        _lastSaveTime += 30 * 1000; // try again in 30 secs
+                        }
+                #endif
                 _skySound->checkFxQueue();
                 _skyMouse->mouseEngine((uint16)_mouseX, (uint16)_mouseY);
                 handleKey();