aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Page2008-06-26 04:54:29 +0000
committerChristopher Page2008-06-26 04:54:29 +0000
commitd2c0b9d0034a5f5cf49c2fae769b146c6ffc980e (patch)
tree97975aea74c98a5de890a546c0c09bd812c2fb12
parente53556af85bf3727d42898625a6eee508ca82862 (diff)
downloadscummvm-rg350-d2c0b9d0034a5f5cf49c2fae769b146c6ffc980e.tar.gz
scummvm-rg350-d2c0b9d0034a5f5cf49c2fae769b146c6ffc980e.tar.bz2
scummvm-rg350-d2c0b9d0034a5f5cf49c2fae769b146c6ffc980e.zip
Sword2 now uses the new _quit flag
svn-id: r32794
-rw-r--r--engines/sword2/sword2.cpp3
-rw-r--r--engines/sword2/sword2.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 7331d1f761..dc52bc5630 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -229,7 +229,6 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst) {
_gameCycle = 0;
_gameSpeed = 1;
- _quit = false;
syst->getEventManager()->registerRandomSource(_rnd, "sword2");
}
@@ -460,7 +459,7 @@ int Sword2Engine::go() {
#endif
}
- return 0;
+ return _rtl;
}
void Sword2Engine::closeGame() {
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 05c5d7fa47..15923cf822 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -141,8 +141,6 @@ public:
bool getSubtitles() { return _useSubtitles; }
void setSubtitles(bool b) { _useSubtitles = b; }
- bool _quit;
-
uint32 _features;
MemoryManager *_memory;