diff options
| author | Johannes Schickel | 2012-11-23 02:56:26 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-11-23 02:56:26 +0100 |
| commit | 5a352da4378b411ce13e2285cedb6429f2e213af (patch) | |
| tree | 09db555e75b79be7ff728b35dd37017842601632 | |
| parent | 138db7f39d1ade0a7c0718288e3dc8bb1a88faf8 (diff) | |
| download | scummvm-rg350-5a352da4378b411ce13e2285cedb6429f2e213af.tar.gz scummvm-rg350-5a352da4378b411ce13e2285cedb6429f2e213af.tar.bz2 scummvm-rg350-5a352da4378b411ce13e2285cedb6429f2e213af.zip | |
KYRA: Rename kReadSaveHeaderError to ReadSaveHeaderError.
| -rw-r--r-- | engines/kyra/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.h | 4 | ||||
| -rw-r--r-- | engines/kyra/saveload.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index e422f3ea19..95c4accd29 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -298,7 +298,7 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s if (in) { Kyra::KyraEngine_v1::SaveHeader header; - Kyra::KyraEngine_v1::kReadSaveHeaderError error; + Kyra::KyraEngine_v1::ReadSaveHeaderError error; error = Kyra::KyraEngine_v1::readSaveHeader(in, true, header); delete in; diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 79903e6f39..cd048563ca 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -408,14 +408,14 @@ protected: Graphics::Surface *thumbnail; }; - enum kReadSaveHeaderError { + enum ReadSaveHeaderError { kRSHENoError = 0, kRSHEInvalidType = 1, kRSHEInvalidVersion = 2, kRSHEIoError = 3 }; - static kReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *file, bool loadThumbnail, SaveHeader &header); + static ReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *file, bool loadThumbnail, SaveHeader &header); void loadGameStateCheck(int slot); virtual Common::Error loadGameState(int slot) = 0; diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index 41ba1e5e50..bacfb62c16 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -37,7 +37,7 @@ namespace Kyra { -KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::SeekableReadStream *in, bool loadThumbnail, SaveHeader &header) { +KyraEngine_v1::ReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::SeekableReadStream *in, bool loadThumbnail, SaveHeader &header) { uint32 type = in->readUint32BE(); header.originalSave = false; header.oldHeader = false; @@ -140,7 +140,7 @@ Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filena if (!(in = _saveFileMan->openForLoading(filename))) return 0; - kReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, false, header); + ReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, false, header); if (errorCode != kRSHENoError) { if (errorCode == kRSHEInvalidType) warning("No ScummVM Kyra engine savefile header"); |