diff options
-rw-r--r-- | engines/kyra/kyra.h | 1 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.h | 5 | ||||
-rw-r--r-- | engines/kyra/kyra_v2.h | 5 | ||||
-rw-r--r-- | engines/kyra/saveload.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/timer.cpp | 3 |
5 files changed, 4 insertions, 16 deletions
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index d8dc0f4a3a..7207c63090 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -216,7 +216,6 @@ protected: // 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); diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 3944a5b0ed..5d4350f857 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -281,12 +281,7 @@ public: 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); diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 07c3271e05..dc4dddac86 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -1169,12 +1169,7 @@ protected: 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); diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index 30c6782fb2..334c015689 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -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 @@ Common::InSaveFile *KyraEngine::openSaveForReading(const char *filename, uint32 } 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 @@ Common::OutSaveFile *KyraEngine::openSaveForWriting(const char *filename, const // Savegame version out->writeUint32BE(saveGameID()); - out->writeUint32BE(curSaveVersion()); + out->writeUint32BE(CURRENT_SAVE_VERSION); out->write(saveName, 31); if (_flags.isTalkie) out->writeUint32BE(GF_TALKIE); diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index 62e64773c8..c0f47111c6 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -198,9 +198,6 @@ void TimerManager::disable(uint8 id) { 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) { |