From bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 11 May 2008 23:16:50 +0000 Subject: - Renamed KyraEngine to KyraEngine_v1 - kyra.* -> kyra_v1.* - scene.cpp -> scene_v1.cpp svn-id: r32044 --- engines/kyra/saveload.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/kyra/saveload.cpp') diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index 590d40f2e3..22f934ba69 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -27,7 +27,7 @@ #include "common/savefile.h" #include "common/system.h" -#include "kyra/kyra.h" +#include "kyra/kyra_v1.h" #define CURRENT_SAVE_VERSION 13 @@ -37,7 +37,7 @@ namespace Kyra { -KyraEngine::kReadSaveHeaderError KyraEngine::readSaveHeader(Common::InSaveFile *in, SaveHeader &header) { +KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::InSaveFile *in, SaveHeader &header) { uint32 type = in->readUint32BE(); header.originalSave = false; header.oldHeader = false; @@ -108,14 +108,14 @@ KyraEngine::kReadSaveHeaderError KyraEngine::readSaveHeader(Common::InSaveFile * return (in->ioFailed() ? kRSHEIoError : kRSHENoError); } -Common::InSaveFile *KyraEngine::openSaveForReading(const char *filename, SaveHeader &header) { - debugC(9, kDebugLevelMain, "KyraEngine::openSaveForReading('%s', -)", filename); +Common::InSaveFile *KyraEngine_v1::openSaveForReading(const char *filename, SaveHeader &header) { + debugC(9, kDebugLevelMain, "KyraEngine_v1::openSaveForReading('%s', -)", filename); Common::InSaveFile *in = 0; if (!(in = _saveFileMan->openForLoading(filename))) return 0; - kReadSaveHeaderError errorCode = KyraEngine::readSaveHeader(in, header); + kReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, header); if (errorCode != kRSHENoError) { if (errorCode == kRSHEInvalidType) warning("No ScummVM Kyra engine savefile header."); @@ -159,8 +159,8 @@ Common::InSaveFile *KyraEngine::openSaveForReading(const char *filename, SaveHea return in; } -Common::OutSaveFile *KyraEngine::openSaveForWriting(const char *filename, const char *saveName) const { - debugC(9, kDebugLevelMain, "KyraEngine::openSaveForWriting('%s', '%s')", filename, saveName); +Common::OutSaveFile *KyraEngine_v1::openSaveForWriting(const char *filename, const char *saveName) const { + debugC(9, kDebugLevelMain, "KyraEngine_v1::openSaveForWriting('%s', '%s')", filename, saveName); if (_quitFlag) return 0; @@ -191,7 +191,7 @@ Common::OutSaveFile *KyraEngine::openSaveForWriting(const char *filename, const return out; } -const char *KyraEngine::getSavegameFilename(int num) { +const char *KyraEngine_v1::getSavegameFilename(int num) { static Common::String filename; assert(num >= 0 && num <= 999); @@ -204,7 +204,7 @@ const char *KyraEngine::getSavegameFilename(int num) { return filename.c_str(); } -bool KyraEngine::saveFileLoadable(int slot) { +bool KyraEngine_v1::saveFileLoadable(int slot) { if (slot < 0 || slot > 999) return false; -- cgit v1.2.3