aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/parallaction.cpp4
-rw-r--r--engines/parallaction/parallaction.h10
-rw-r--r--engines/parallaction/parallaction_br.cpp8
-rw-r--r--engines/parallaction/parallaction_ns.cpp8
4 files changed, 15 insertions, 15 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 388675e31a..5abc308bee 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -109,7 +109,7 @@ Parallaction::~Parallaction() {
}
-int Parallaction::init() {
+Common::Error Parallaction::init() {
_engineFlags = 0;
_objectsNames = NULL;
@@ -145,7 +145,7 @@ int Parallaction::init() {
setupBalloonManager();
- return 0;
+ return Common::kNoError;
}
void Parallaction::updateView() {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index b1baa28530..5b56f29e94 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -228,7 +228,7 @@ public:
~Parallaction();
// Engine APIs
- virtual int init();
+ virtual Common::Error init();
virtual bool hasFeature(EngineFeature f) const;
// info
@@ -363,8 +363,8 @@ public:
~Parallaction_ns();
// Engine APIs
- virtual int init();
- virtual int go();
+ virtual Common::Error init();
+ virtual Common::Error go();
public:
virtual void parseLocation(const char *filename);
@@ -451,8 +451,8 @@ public:
Parallaction_br(OSystem* syst, const PARALLACTIONGameDescription *gameDesc) : Parallaction_ns(syst, gameDesc) { }
~Parallaction_br();
- int init();
- int go();
+ Common::Error init();
+ Common::Error go();
public:
virtual void parseLocation(const char* name);
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index 2988350cb4..fe179a0ba4 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -42,7 +42,7 @@ const char *Parallaction_br::_partNames[] = {
"PART4"
};
-int Parallaction_br::init() {
+Common::Error Parallaction_br::init() {
_screenWidth = 640;
_screenHeight = 400;
@@ -89,7 +89,7 @@ int Parallaction_br::init() {
Parallaction::init();
- return 0;
+ return Common::kNoError;
}
Parallaction_br::~Parallaction_br() {
@@ -102,7 +102,7 @@ void Parallaction_br::callFunction(uint index, void* parm) {
(this->*_callables[index])(parm);
}
-int Parallaction_br::go() {
+Common::Error Parallaction_br::go() {
bool splash = true;
@@ -127,7 +127,7 @@ int Parallaction_br::go() {
cleanupGame();
}
- return 0;
+ return Common::kNoError;
}
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index a0fba08287..efb5f94b84 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -143,7 +143,7 @@ void LocationName::bind(const char *s) {
-int Parallaction_ns::init() {
+Common::Error Parallaction_ns::init() {
_screenWidth = 320;
_screenHeight = 200;
@@ -193,7 +193,7 @@ int Parallaction_ns::init() {
Parallaction::init();
- return 0;
+ return Common::kNoError;
}
Parallaction_ns::~Parallaction_ns() {
@@ -228,7 +228,7 @@ void Parallaction_ns::callFunction(uint index, void* parm) {
}
-int Parallaction_ns::go() {
+Common::Error Parallaction_ns::go() {
_saveLoad->renameOldSavefiles();
_globalFlagsNames = _disk->loadTable("global");
@@ -239,7 +239,7 @@ int Parallaction_ns::go() {
runGame();
}
- return 0;
+ return Common::kNoError;
}
void Parallaction_ns::switchBackground(const char* background, const char* mask) {