[Scummvm-cvs-logs] SF.net SVN: scummvm: [26567] scummvm/trunk/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Apr 22 18:06:00 CEST 2007
Revision: 26567
http://scummvm.svn.sourceforge.net/scummvm/?rev=26567&view=rev
Author: sev
Date: 2007-04-22 09:06:00 -0700 (Sun, 22 Apr 2007)
Log Message:
-----------
Fix for loading savegames from the command line.
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/saveload.cpp
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2007-04-22 11:01:08 UTC (rev 26566)
+++ scummvm/trunk/engines/agi/agi.cpp 2007-04-22 16:06:00 UTC (rev 26567)
@@ -425,7 +425,7 @@
snprintf (saveNameBuffer, 256, "%s.%03d", _targetName.c_str(), ConfMan.getInt("save_slot"));
- loadGame(saveNameBuffer);
+ loadGame(saveNameBuffer, false); // Do not check game id
}
return ec;
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2007-04-22 11:01:08 UTC (rev 26566)
+++ scummvm/trunk/engines/agi/agi.h 2007-04-22 16:06:00 UTC (rev 26567)
@@ -545,7 +545,7 @@
int saveGame(const char *fileName, const char *saveName);
int saveGameDialog();
int saveGameSimple();
- int loadGame(const char *fileName);
+ int loadGame(const char *fileName, bool checkId = true);
int loadGameDialog();
int loadGameSimple();
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2007-04-22 11:01:08 UTC (rev 26566)
+++ scummvm/trunk/engines/agi/saveload.cpp 2007-04-22 16:06:00 UTC (rev 26567)
@@ -215,7 +215,7 @@
return errOK;
}
-int AgiEngine::loadGame(const char *fileName) {
+int AgiEngine::loadGame(const char *fileName, bool checkId) {
char description[31], saveVersion, loadId[8];
int i, vtEntries = MAX_VIEWTABLE;
uint8 t;
@@ -251,7 +251,7 @@
_game.state = in->readByte();
in->read(loadId, 8);
- if (strcmp(loadId, _game.id)) {
+ if (strcmp(loadId, _game.id) && checkId) {
delete in;
warning("This save seems to be from a different AGI game (save from %s, running %s), not loaded", loadId, _game.id);
return errBadFileOpen;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list