From 27c427add299399a71fe96f591690e589e35c031 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Wed, 25 Jun 2008 03:17:01 +0000
Subject: Scumm and sky now use the new _quit flag

svn-id: r32775
---
 engines/sky/intro.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/sky/intro.cpp')

diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 024360561c..f5699eb2f1 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -636,7 +636,6 @@ Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *t
 	_textBuf = (uint8*)malloc(10000);
 	_saveBuf = (uint8*)malloc(10000);
 	_bgBuf = NULL;
-	_quitProg = false;
 	_relDelay = 0;
 }
 
@@ -913,7 +912,7 @@ bool Intro::escDelay(uint32 msecs) {
 				if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
 					return false;
 			} else if (event.type == Common::EVENT_QUIT) {
-				_quitProg = true;
+				g_engine->_quit = true;
 				return false;
 			}
 		}
-- 
cgit v1.2.3


From e53556af85bf3727d42898625a6eee508ca82862 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Thu, 26 Jun 2008 00:50:16 +0000
Subject: Fixed quitting from BASS intro, cleaned up comments in agos

svn-id: r32793
---
 engines/sky/intro.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sky/intro.cpp')

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;
 			}
-- 
cgit v1.2.3


From d0dcc1ad7943a528f0f4f016a64ee45251adb6a8 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Thu, 26 Jun 2008 22:03:49 +0000
Subject: Quit or RTL from the main menu now triggers an EVENT_QUIT in
 DefaultEventManager::pollEvent()

svn-id: r32813
---
 engines/sky/intro.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/sky/intro.cpp')

diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 56c2fff1b4..51160924da 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -911,8 +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 || g_engine->_quit) {
-				g_engine->_quit = true;
+			} else if (event.type == Common::EVENT_QUIT) {
 				return false;
 			}
 		}
-- 
cgit v1.2.3


From 7f480ac571f978802a3ecd5cf6169d0271d1f561 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Wed, 16 Jul 2008 04:22:56 +0000
Subject: Quit and RTL code is more modular now.  EVENT_RTL no longer sets
 _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT.  EVENT_RTL and
 EVENT_QUIT are completely separate from each other.  Engine::quit() method
 now checks both _shouldQuit and _shouldRTL to determine if the engine should
 exit.  There is no longer a need for resetQuit(), so it's removed

svn-id: r33082
---
 engines/sky/intro.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sky/intro.cpp')

diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 51160924da..d7a94f6c2f 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 || event.type == Common::EVENT_RTL) {
 				return false;
 			}
 		}
-- 
cgit v1.2.3


From 2d31207a8169491647d8fa3baab7eadbfdfa1da9 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Wed, 13 Aug 2008 20:27:39 +0000
Subject: Fixed some memory leaks

svn-id: r33846
---
 engines/sky/intro.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines/sky/intro.cpp')

diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index d7a94f6c2f..86e26309c9 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -640,9 +640,6 @@ Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *t
 }
 
 Intro::~Intro(void) {
-
-	_mixer->stopAll();
-	_skyScreen->stopSequence();
 	if (_textBuf)
 		free(_textBuf);
 	if (_saveBuf)
-- 
cgit v1.2.3