aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2/sword2.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/sword2/sword2.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/sword2/sword2.cpp')
-rw-r--r--engines/sword2/sword2.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index c596e2f8c0..f1f880c11e 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -218,7 +218,7 @@ Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) c
Common::FSList fslist;
Common::FSNode dir(ConfMan.get("path"));
if (!dir.getChildren(fslist, Common::FSNode::kListAll)) {
- return Common::kInvalidPathError;
+ return Common::kNoGameDataFoundError;
}
// Invoke the detector
@@ -349,7 +349,7 @@ void Sword2Engine::setupPersistentResources() {
_resman->openResource(CUR_PLAYER_ID);
}
-int Sword2Engine::init() {
+Common::Error Sword2Engine::init() {
// Get some falling RAM and put it in your pocket, never let it slip
// away
@@ -378,7 +378,7 @@ int Sword2Engine::init() {
_resman = new ResourceManager(this);
if (!_resman->init())
- return 1;
+ return Common::kUnknownError;
_logic = new Logic(this);
_fontRenderer = new FontRenderer(this);
@@ -426,7 +426,7 @@ int Sword2Engine::init() {
// will either have killed the music, or done a crossfade.
if (shouldQuit())
- return 0;
+ return Common::kNoError;
if (result)
startGame();
@@ -435,10 +435,10 @@ int Sword2Engine::init() {
_screen->initialiseRenderCycle();
- return 0;
+ return Common::kNoError;
}
-int Sword2Engine::go() {
+Common::Error Sword2Engine::go() {
while (1) {
if (_debugger->isAttached())
_debugger->onFrame();
@@ -514,7 +514,7 @@ int Sword2Engine::go() {
#endif
}
- return 0;
+ return Common::kNoError;
}
void Sword2Engine::restartGame() {