From 40136f25909bd8773cac0f08740a36037395e9a7 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 6 Nov 2008 17:05:54 +0000 Subject: Switched various Engine APIs to use Common::Error svn-id: r34916 --- engines/sword1/sword1.cpp | 8 ++++---- engines/sword1/sword1.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/sword1') diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 9a6bfac030..7f942f3b2d 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -309,7 +309,7 @@ SwordEngine::~SwordEngine() { delete _resMan; } -int SwordEngine::init() { +Common::Error SwordEngine::init() { _system->beginGFXTransaction(); initCommonGFX(true); @@ -377,7 +377,7 @@ int SwordEngine::init() { _mouse->initialize(); _control = new Control(_saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music); - return 0; + return Common::kNoError; } void SwordEngine::reinitialize(void) { @@ -719,7 +719,7 @@ void SwordEngine::checkCdFiles(void) { // check if we're running from cd, hdd or #endif } -int SwordEngine::go() { +Common::Error SwordEngine::go() { uint16 startPos = ConfMan.getInt("boot_param"); if (startPos) { _logic->startPositions(startPos); @@ -757,7 +757,7 @@ int SwordEngine::go() { } } - return 0; + return Common::kNoError; } void SwordEngine::checkCd(void) { diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h index 8397f30705..8f77f3119a 100644 --- a/engines/sword1/sword1.h +++ b/engines/sword1/sword1.h @@ -81,8 +81,8 @@ public: uint32 _features; protected: // Engine APIs - virtual int init(); - virtual int go(); + virtual Common::Error init(); + virtual Common::Error go(); virtual bool hasFeature(EngineFeature f) const; virtual void syncSoundSettings(); -- cgit v1.2.3