Ticket #3651: sword1_save.patch

sword1.cpp

@@ -339 +339 @@
         _logic->initialize();
         _objectMan->initialize();
         _mouse->initialize();
-        _control = new Control(_saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music);
+        _control = new Control(this, _saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music);
 
         return 0;
 }

control.h

@@ -42 +42 @@
 class Mouse;
 class Music;
 class Sound;
+class SwordEngine;
 
 #define MAX_BUTTONS 16
 
@@ -82 +83 @@
 
 class Control {
 public:
-        Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic);
+        Control(SwordEngine *engine, Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic);
         uint8 runPanel(void);
         void doRestore(void);
         void askForCd(void);
@@ -134 +135 @@
         static const uint8 _languageStrings[8 * 20][43];
         const uint8 (*_lStrings)[43];
         Common::SaveFileManager *_saveFileMan;
+        SwordEngine *_engine;
         ObjectMan *_objMan;
         ResMan *_resMan;
         OSystem *_system;

control.cpp

@@ -160 +160 @@
         draw();
 }
 
-Control::Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
+Control::Control(SwordEngine *engine, Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
+        _engine = engine;
         _saveFileMan = saveFileMan;
         _resMan = pResMan;
         _objMan = pObjMan;
@@ -717 +718 @@
 
 void Control::readSavegameDescriptions(void) {
         Common::InSaveFile *inf;
-        inf = _saveFileMan->openForLoading("SAVEGAME.INF");
+        inf = _saveFileMan->openForLoading((_engine->getTargetName() + ".inf").c_str());
         _saveScrollPos = _saveFiles = 0;
         _selectedSavegame = 255;
         for (uint8 cnt = 0; cnt < 64; cnt++) {
@@ -761 +762 @@
 
 void Control::writeSavegameDescriptions(void) {
         Common::OutSaveFile *outf;
-        outf = _saveFileMan->openForSaving("SAVEGAME.INF");
+        outf = _saveFileMan->openForSaving((_engine->getTargetName() + ".inf").c_str());
 
         if (!outf) {
                 // Display an error message, and do nothing
-                displayMessage(0, "Can't create SAVEGAME.INF. (%s)", _saveFileMan->popErrorDesc().c_str());
+                displayMessage(0, "Can't create %s.inf. (%s)", _engine->getTargetName().c_str(), _saveFileMan->popErrorDesc().c_str());
                 return;
         }
 
@@ -784 +785 @@
         }
         outf->finalize();
         if (outf->ioFailed())
-                displayMessage(0, "Can't write to SAVEGAME.INF. Device full? (%s)", _saveFileMan->popErrorDesc().c_str());
+                displayMessage(0, "Can't write to %s.inf. Device full? (%s)", _engine->getTargetName().c_str(), _saveFileMan->popErrorDesc().c_str());
         delete outf;
 }
 
@@ -947 +948 @@
 }
 
 void Control::saveGameToFile(uint8 slot) {
-        char fName[15];
+        Common::String filename = _engine->getTargetName();
+        char fName[5];
+        snprintf(fName, 5, ".%03d", slot);
+        filename += fName;
+
         uint16 cnt;
-        sprintf(fName, "SAVEGAME.%03d", slot);
         uint16 liveBuf[TOTAL_SECTIONS];
         Common::OutSaveFile *outf;
-        outf = _saveFileMan->openForSaving(fName);
+        outf = _saveFileMan->openForSaving(filename.c_str());
         if (!outf) {
                 // Display an error message and do nothing
-                displayMessage(0, "Unable to create file '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str());
+                displayMessage(0, "Unable to create file '%s'. (%s)", filename.c_str(), _saveFileMan->popErrorDesc().c_str());
                 return;
         }
 
@@ -979 +983 @@
                 outf->writeUint32LE(playerRaw[cnt2]);
         outf->finalize();
         if (outf->ioFailed())
-                displayMessage(0, "Couldn't write to file '%s'. Device full? (%s)", fName, _saveFileMan->popErrorDesc().c_str());
+                displayMessage(0, "Couldn't write to file '%s'. Device full? (%s)", filename.c_str(), _saveFileMan->popErrorDesc().c_str());
         delete outf;
 }
 
 bool Control::restoreGameFromFile(uint8 slot) {
-        char fName[15];
+        Common::String filename = _engine->getTargetName();
+        char fName[5];
+        snprintf(fName, 5, ".%03d", slot);
+        filename += fName;
+
         uint16 cnt;
-        sprintf(fName, "SAVEGAME.%03d", slot);
         Common::InSaveFile *inf;
-        inf = _saveFileMan->openForLoading(fName);
+        inf = _saveFileMan->openForLoading(filename.c_str());
         if (!inf) {
                 // Display an error message, and do nothing
-                displayMessage(0, "Can't open file '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str());
+                displayMessage(0, "Can't open file '%s'. (%s)", filename.c_str(), _saveFileMan->popErrorDesc().c_str());
                 return false;
         }
 
@@ -1015 +1022 @@
                 playerBuf[cnt2] = inf->readUint32LE();
 
         if (inf->ioFailed()) {
-                displayMessage(0, "Can't read from file '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str());
+                displayMessage(0, "Can't read from file '%s'. (%s)", filename.c_str(), _saveFileMan->popErrorDesc().c_str());
                 delete inf;
                 free(_restoreBuf);
                 _restoreBuf = NULL;

sword1.h

@@ -80 +80 @@
         void reinitialize(void);
 
         uint32 _features;
+
+        Common::String getTargetName() const { return _targetName; }
 protected:
         int go();
         int init();