diff options
| author | Max Horn | 2008-09-01 20:20:57 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-01 20:20:57 +0000 |
| commit | 5013b01e7414910648bc8cc6c413c97a8160092d (patch) | |
| tree | e196bbb9da9b8abe5400802cf52c0884533c7624 /engines/sky/intro.cpp | |
| parent | 5ceb635420b3350d3093bcfb3d5b9c00086ffd66 (diff) | |
| parent | 852bc9dbb750b9995d31e70f4158c97d3758c46f (diff) | |
| download | scummvm-rg350-5013b01e7414910648bc8cc6c413c97a8160092d.tar.gz scummvm-rg350-5013b01e7414910648bc8cc6c413c97a8160092d.tar.bz2 scummvm-rg350-5013b01e7414910648bc8cc6c413c97a8160092d.zip | |
Merging more of the GSoC 2008 RTL branch: SKY
svn-id: r34254
Diffstat (limited to 'engines/sky/intro.cpp')
| -rw-r--r-- | engines/sky/intro.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 024360561c..86e26309c9 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -636,14 +636,10 @@ 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; } Intro::~Intro(void) { - - _mixer->stopAll(); - _skyScreen->stopSequence(); if (_textBuf) free(_textBuf); if (_saveBuf) @@ -912,8 +908,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) { - _quitProg = true; + } else if (event.type == Common::EVENT_QUIT || event.type == Common::EVENT_RTL) { return false; } } |