[Scummvm-cvs-logs] SF.net SVN: scummvm: [31155] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Mar 17 19:13:28 CET 2008
Revision: 31155
http://scummvm.svn.sourceforge.net/scummvm/?rev=31155&view=rev
Author: lordhoto
Date: 2008-03-17 11:13:28 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
Let Kyra1 and Kyra2 use a common savegame version number. (cleanup)
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.h
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/kyra/kyra_v2.h
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/kyra/timer.cpp
Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h 2008-03-17 18:10:52 UTC (rev 31154)
+++ scummvm/trunk/engines/kyra/kyra.h 2008-03-17 18:13:28 UTC (rev 31155)
@@ -216,7 +216,6 @@
// save/load
virtual uint32 saveGameID() const = 0;
- virtual uint32 curSaveVersion() const = 0;
const char *getSavegameFilename(int num);
Common::InSaveFile *openSaveForReading(const char *filename, uint32 &version, char *saveName);
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2008-03-17 18:10:52 UTC (rev 31154)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2008-03-17 18:13:28 UTC (rev 31155)
@@ -281,12 +281,7 @@
void snd_voiceWaitForFinish(bool ingame = true);
protected:
- enum {
- kSaveGameVersion = 8
- };
-
uint32 saveGameID() const { return 'KYRA'; }
- uint32 curSaveVersion() const { return kSaveGameVersion; }
void saveGame(const char *fileName, const char *saveName);
void loadGame(const char *fileName);
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2008-03-17 18:10:52 UTC (rev 31154)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2008-03-17 18:13:28 UTC (rev 31155)
@@ -1169,12 +1169,7 @@
int _dbgPass;
// save/load specific
- enum {
- kSaveGameVersion = 1
- };
-
uint32 saveGameID() const { return 'HOFS'; }
- uint32 curSaveVersion() const { return kSaveGameVersion; }
void saveGame(const char *fileName, const char *saveName);
void loadGame(const char *fileName);
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2008-03-17 18:10:52 UTC (rev 31154)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2008-03-17 18:13:28 UTC (rev 31155)
@@ -29,6 +29,8 @@
#include "kyra/kyra.h"
+#define CURRENT_SAVE_VERSION 8
+
#define GF_FLOPPY (1 << 0)
#define GF_TALKIE (1 << 1)
#define GF_FMTOWNS (1 << 2)
@@ -56,7 +58,7 @@
}
version = in->readUint32BE();
- if (version > curSaveVersion()) {
+ if (version > CURRENT_SAVE_VERSION) {
warning("Savegame is not the right version (%u)", version);
delete in;
return 0;
@@ -108,7 +110,7 @@
// Savegame version
out->writeUint32BE(saveGameID());
- out->writeUint32BE(curSaveVersion());
+ out->writeUint32BE(CURRENT_SAVE_VERSION);
out->write(saveName, 31);
if (_flags.isTalkie)
out->writeUint32BE(GF_TALKIE);
Modified: scummvm/trunk/engines/kyra/timer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer.cpp 2008-03-17 18:10:52 UTC (rev 31154)
+++ scummvm/trunk/engines/kyra/timer.cpp 2008-03-17 18:13:28 UTC (rev 31155)
@@ -198,9 +198,6 @@
void TimerManager::loadDataFromFile(Common::InSaveFile *file, int version) {
debugC(9, kDebugLevelTimer, "TimerManager::loadDataFromFile(%p, %d)", (const void*)file, version);
- if (_vm->game() != GI_KYRA1)
- version += 7;
-
if (version <= 7) {
_nextRun = 0;
for (int i = 0; i < 32; ++i) {
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