aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorChristopher Page2008-06-26 00:50:16 +0000
committerChristopher Page2008-06-26 00:50:16 +0000
commite53556af85bf3727d42898625a6eee508ca82862 (patch)
tree2d25d1978a78b0a710bc1b5c50a39ca265dcfcb7 /engines
parent27c427add299399a71fe96f591690e589e35c031 (diff)
downloadscummvm-rg350-e53556af85bf3727d42898625a6eee508ca82862.tar.gz
scummvm-rg350-e53556af85bf3727d42898625a6eee508ca82862.tar.bz2
scummvm-rg350-e53556af85bf3727d42898625a6eee508ca82862.zip
Fixed quitting from BASS intro, cleaned up comments in agos
svn-id: r32793
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/agos.cpp3
-rw-r--r--engines/sky/intro.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index cd121b6300..0b08f659f3 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -101,9 +101,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
_vc_get_out_of_code = 0;
_gameOffsetsPtr = 0;
- //_quit = false;
- //_rtl = false;
-
_debugger = 0;
_gameFile = 0;
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index f5699eb2f1..56c2fff1b4 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -911,7 +911,7 @@ bool Intro::escDelay(uint32 msecs) {
if (event.type == Common::EVENT_KEYDOWN) {
if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
return false;
- } else if (event.type == Common::EVENT_QUIT) {
+ } else if (event.type == Common::EVENT_QUIT || g_engine->_quit) {
g_engine->_quit = true;
return false;
}