aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/lol.cpp
diff options
context:
space:
mode:
authorMax Horn2011-04-18 17:39:31 +0200
committerMax Horn2011-04-18 18:22:02 +0200
commit73f04118f3d03e25fa1139cfea2b1330f0098bd4 (patch)
treebd0d638d9fbecf5207d0ac0fd775febca9e8b3db /engines/kyra/lol.cpp
parente9c228564a97267bd439704b96cb659986511224 (diff)
downloadscummvm-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/lol.cpp')
-rw-r--r--engines/kyra/lol.cpp8
1 files changed, 6 insertions, 2 deletions
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;
}