aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_lok.cpp
diff options
context:
space:
mode:
authorMax Horn2008-11-06 17:05:54 +0000
committerMax Horn2008-11-06 17:05:54 +0000
commit40136f25909bd8773cac0f08740a36037395e9a7 (patch)
treebf61db949f9942c10cad667042b1e2403a9b51cd /engines/kyra/kyra_lok.cpp
parent4c8f221fb8f5735932652c3279efd6f2e941d948 (diff)
downloadscummvm-rg350-40136f25909bd8773cac0f08740a36037395e9a7.tar.gz
scummvm-rg350-40136f25909bd8773cac0f08740a36037395e9a7.tar.bz2
scummvm-rg350-40136f25909bd8773cac0f08740a36037395e9a7.zip
Switched various Engine APIs to use Common::Error
svn-id: r34916
Diffstat (limited to 'engines/kyra/kyra_lok.cpp')
-rw-r--r--engines/kyra/kyra_lok.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index e8db3467fc..e995c74fd2 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -155,7 +155,7 @@ KyraEngine_LoK::~KyraEngine_LoK() {
delete[] _sceneAnimTable[i];
}
-int KyraEngine_LoK::init() {
+Common::Error KyraEngine_LoK::init() {
_screen = new Screen_LoK(this, _system);
assert(_screen);
_screen->setResolution();
@@ -284,10 +284,10 @@ int KyraEngine_LoK::init() {
_lastMusicCommand = 0;
- return 0;
+ return Common::kNoError;
}
-int KyraEngine_LoK::go() {
+Common::Error KyraEngine_LoK::go() {
if (_res->getFileSize("6.FNT"))
_screen->loadFont(Screen::FID_6_FNT, "6.FNT");
_screen->loadFont(Screen::FID_8_FNT, "8FAT.FNT");
@@ -304,7 +304,7 @@ int KyraEngine_LoK::go() {
setGameFlag(0xEF);
seq_intro();
if (shouldQuit())
- return 0;
+ return Common::kNoError;
if (_skipIntroFlag && _abortIntroFlag)
resetGameFlag(0xEF);
}
@@ -312,7 +312,7 @@ int KyraEngine_LoK::go() {
resetGameFlag(0xEF);
mainLoop();
}
- return 0;
+ return Common::kNoError;
}