aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
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/agi
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/agi')
-rw-r--r--engines/agi/agi.cpp8
-rw-r--r--engines/agi/agi.h4
-rw-r--r--engines/agi/preagi.cpp4
-rw-r--r--engines/agi/preagi.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 3c1ec5efde..15af27b587 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -779,7 +779,7 @@ AgiEngine::~AgiEngine() {
free(_predictiveDictText);
}
-int AgiBase::init() {
+Common::Error AgiBase::init() {
// Initialize backend
_system->beginGFXTransaction();
@@ -791,10 +791,10 @@ int AgiBase::init() {
_gfx->gfxSetPalette();
- return 0;
+ return Common::kNoError;
}
-int AgiEngine::go() {
+Common::Error AgiEngine::go() {
CursorMan.showMouse(true);
report(" \nAGI engine %s is ready.\n", gScummVMVersion);
@@ -808,7 +808,7 @@ int AgiEngine::go() {
runGame();
- return 0;
+ return Common::kNoError;
}
void AgiEngine::syncSoundSettings() {
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index a1edcb2ad0..2e4710744b 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -696,7 +696,7 @@ struct StringData {
class AgiBase : public ::Engine {
protected:
// Engine API
- virtual int init();
+ virtual Common::Error init();
virtual bool hasFeature(EngineFeature f) const;
virtual void initialize() = 0;
@@ -745,7 +745,7 @@ class AgiEngine : public AgiBase {
protected:
// Engine APIs
- virtual int go();
+ virtual Common::Error go();
virtual void syncSoundSettings();
void initialize();
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index 666d1b1b11..a3045a31cc 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -189,7 +189,7 @@ PreAgiEngine::~PreAgiEngine() {
}
-int PreAgiEngine::go() {
+Common::Error PreAgiEngine::go() {
setflag(fSoundOn, true); // enable sound
/*
@@ -227,7 +227,7 @@ FIXME (Fingolfin asks): Why are Mickey, Winnie and Troll standalone classes
error("Unknown preagi engine");
break;
}
- return 0;
+ return Common::kNoError;
}
} // End of namespace Agi
diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h
index 73288de93c..10a46aa6ec 100644
--- a/engines/agi/preagi.h
+++ b/engines/agi/preagi.h
@@ -37,7 +37,7 @@ class PreAgiEngine : public AgiBase {
int _gameId;
protected:
- int go();
+ Common::Error go();
void initialize();
public: