diff options
| author | Max Horn | 2011-04-18 17:39:31 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-18 18:22:02 +0200 |
| commit | 73f04118f3d03e25fa1139cfea2b1330f0098bd4 (patch) | |
| tree | bd0d638d9fbecf5207d0ac0fd775febca9e8b3db /engines/kyra | |
| parent | e9c228564a97267bd439704b96cb659986511224 (diff) | |
| download | scummvm-rg350-73f04118f3d03e25fa1139cfea2b1330f0098bd4.tar.gz scummvm-rg350-73f04118f3d03e25fa1139cfea2b1330f0098bd4.tar.bz2 scummvm-rg350-73f04118f3d03e25fa1139cfea2b1330f0098bd4.zip | |
COMMON: Rename Error to ErrorCode, introduce new Error class
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v1.h | 2 | ||||
| -rw-r--r-- | engines/kyra/lol.cpp | 8 | ||||
| -rw-r--r-- | engines/kyra/saveload.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index cf51774b0f..801d31d676 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -247,7 +247,7 @@ protected: Common::Error err; registerDefaultSettings(); err = init(); - if (err != Common::kNoError) + if (err.getCode() != Common::kNoError) return err; return go(); } diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 5928c40f92..78c9ed260d 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -591,7 +591,9 @@ Common::Error LoLEngine::go() { if (action == 0) { startupNew(); } else if (_gameToLoad != -1) { - if (loadGameState(_gameToLoad) != Common::kNoError) + // FIXME: Instead of throwing away the error returned by + // loadGameState, we should use it / augment it. + if (loadGameState(_gameToLoad).getCode() != Common::kNoError) error("Couldn't load game slot %d on startup", _gameToLoad); _gameToLoad = -1; } @@ -918,7 +920,9 @@ void LoLEngine::runLoop() { while (!shouldQuit() && _runFlag) { if (_gameToLoad != -1) { - if (loadGameState(_gameToLoad) != Common::kNoError) + // FIXME: Instead of throwing away the error returned by + // loadGameState, we should use it / augment it. + if (loadGameState(_gameToLoad).getCode() != Common::kNoError) error("Couldn't load game slot %d", _gameToLoad); _gameToLoad = -1; } diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index 44579c3377..d14001aea6 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -257,7 +257,9 @@ void KyraEngine_v1::checkAutosave() { } void KyraEngine_v1::loadGameStateCheck(int slot) { - if (loadGameState(slot) != Common::kNoError) { + // FIXME: Instead of throwing away the error returned by + // loadGameState, we should use it / augment it. + if (loadGameState(slot).getCode() != Common::kNoError) { const char *filename = getSavegameFilename(slot); Common::String errorMessage = "Could not load savegame: '"; errorMessage += filename; |