[Scummvm-cvs-logs] SF.net SVN: scummvm:[34658] scummvm/trunk/engines/sword1/animation.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sat Sep 27 19:51:22 CEST 2008
Revision: 34658
http://scummvm.svn.sourceforge.net/scummvm/?rev=34658&view=rev
Author: eriktorbjorn
Date: 2008-09-27 17:51:22 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
Slight simplification of last commit.
Modified Paths:
--------------
scummvm/trunk/engines/sword1/animation.cpp
Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp 2008-09-27 17:47:22 UTC (rev 34657)
+++ scummvm/trunk/engines/sword1/animation.cpp 2008-09-27 17:51:22 UTC (rev 34658)
@@ -265,7 +265,7 @@
_currentFrame = 0;
bool terminated = false;
Common::EventManager *eventMan = _system->getEventManager();
- while (!terminated && decodeFrame() && !_vm->quit()) {
+ while (!terminated && decodeFrame()) {
if (!_movieTexts.empty()) {
if (_currentFrame == _movieTexts[0]->_startFrame) {
_textMan->makeTextSprite(2, (uint8 *)_movieTexts[0]->_text, 600, LETTER_COL);
@@ -295,18 +295,18 @@
handleScreenChanged();
break;
case Common::EVENT_KEYDOWN:
- if (event.kbd.keycode == Common::KEYCODE_ESCAPE) {
- _snd->stopHandle(_bgSoundHandle);
+ if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
terminated = true;
- }
break;
default:
break;
}
}
+ if (_vm->quit())
+ terminated = true;
}
- if (_vm->quit())
+ if (terminated)
_snd->stopHandle(_bgSoundHandle);
while (!_movieTexts.empty()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list