From e53556af85bf3727d42898625a6eee508ca82862 Mon Sep 17 00:00:00 2001 From: Christopher Page Date: Thu, 26 Jun 2008 00:50:16 +0000 Subject: [PATCH] Fixed quitting from BASS intro, cleaned up comments in agos svn-id: r32793 --- engines/agos/agos.cpp | 3 --- engines/sky/intro.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index cd121b6300a..0b08f659f31 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 f5699eb2f15..56c2fff1b45 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; }