[Scummvm-cvs-logs] SF.net SVN: scummvm:[35112] scummvm/trunk/engines/sword1

[thebluegr at users.sourceforge.net]

Revision: 35112
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35112&view=rev
Author:   thebluegr
Date:     2008-11-18 16:57:57 +0000 (Tue, 18 Nov 2008)

Log Message:
-----------
Reverted to old behavior: save games for sword1 can be shared again across all versions (since they're exactly the same) - they're now named sword1.* and no longer named after the game ID

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/control.cpp
    scummvm/trunk/engines/sword1/detection.cpp

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2008-11-18 16:31:55 UTC (rev 35111)
+++ scummvm/trunk/engines/sword1/control.cpp	2008-11-18 16:57:57 UTC (rev 35112)
@@ -720,7 +720,7 @@
 
 void Control::readSavegameDescriptions(void) {
 	char saveName[40];
-	Common::String pattern = ConfMan.get("gameid") + ".???";
+	Common::String pattern = "sword1.???";
 	Common::StringList filenames = _saveFileMan->listSavefiles(pattern.c_str());
 	sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
 
@@ -770,7 +770,7 @@
 }
 
 bool Control::savegamesExist(void) {
-	Common::String pattern = ConfMan.get("gameid") + ".???";
+	Common::String pattern = "sword1.???";
 	Common::StringList saveNames = _saveFileMan->listSavefiles(pattern.c_str());
 	return saveNames.size() > 0;
 }
@@ -975,7 +975,7 @@
 void Control::saveGameToFile(uint8 slot) {
 	char fName[15];
 	uint16 cnt;
-	sprintf(fName, "%s.%03d", ConfMan.get("gameid").c_str(), slot);
+	sprintf(fName, "sword1.%03d", slot);
 	uint16 liveBuf[TOTAL_SECTIONS];
 	Common::OutSaveFile *outf;
 	outf = _saveFileMan->openForSaving(fName);
@@ -1037,7 +1037,7 @@
 bool Control::restoreGameFromFile(uint8 slot) {
 	char fName[15];
 	uint16 cnt;
-	sprintf(fName, "%s.%03d", ConfMan.get("gameid").c_str(), slot);
+	sprintf(fName, "sword1.%03d", slot);
 	Common::InSaveFile *inf;
 	inf = _saveFileMan->openForLoading(fName);
 	if (!inf) {
@@ -1110,7 +1110,7 @@
 	char oldFileName[15];
 	char newFileName[40];
 	sprintf(oldFileName, "SAVEGAME.%03d", slot);
-	sprintf(newFileName, "%s.%03d", ConfMan.get("gameid").c_str(), slot);
+	sprintf(newFileName, "sword1.%03d", slot);
 	uint8 *saveData;
 	int dataSize;
 

Modified: scummvm/trunk/engines/sword1/detection.cpp
===================================================================
--- scummvm/trunk/engines/sword1/detection.cpp	2008-11-18 16:31:55 UTC (rev 35111)
+++ scummvm/trunk/engines/sword1/detection.cpp	2008-11-18 16:57:57 UTC (rev 35112)
@@ -233,7 +233,7 @@
 
 SaveStateDescriptor SwordMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	static char fileName[40];
-	sprintf(fileName, "%s.%03d", target, slot);
+	sprintf(fileName, "sword1.%03d", slot);
 	char name[40];
 
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.