libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let Kyra1 and Kyra2 use a common savegame version number. (cleanup)

Browse Source 
svn-id: r31155
This commit is contained in:
Johannes Schickel 2008-03-17 18:13:28 +00:00
parent 91a800cf02
commit c7ede8337e
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/kyra/kyra.h
View File

@ -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);

5
engines/kyra/kyra_v1.h
View File

@ -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);

5
engines/kyra/kyra_v2.h
View File

@ -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);

6
engines/kyra/saveload.cpp
View File

@ -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);

3
engines/kyra/timer.cpp
View File

@ -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) {