[Scummvm-cvs-logs] SF.net SVN: scummvm: [28723] scummvm/trunk/engines/saga/animation.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Aug 25 18:00:50 CEST 2007
Revision: 28723
http://scummvm.svn.sourceforge.net/scummvm/?rev=28723&view=rev
Author: thebluegr
Date: 2007-08-25 09:00:50 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
The intro of IHNM is shown correctly now
Modified Paths:
--------------
scummvm/trunk/engines/saga/animation.cpp
Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp 2007-08-25 13:13:03 UTC (rev 28722)
+++ scummvm/trunk/engines/saga/animation.cpp 2007-08-25 16:00:50 UTC (rev 28723)
@@ -85,16 +85,6 @@
_cutAwayFade = fade;
- // Chained cutaway, clean up the previous cutaway
- if (_cutawayActive) {
- clearCutaway();
-
- // This is used because when AM is zapping the child's mother in Benny's chapter,
- // there is a cutaway followed by a video. The video needs to start immediately after
- // the cutaway so that it looks like the original
- startImmediately = true;
- }
-
_vm->_gfx->savePalette();
if (fade) {
@@ -118,15 +108,20 @@
}
// Prepare cutaway
- _vm->_gfx->showCursor(false);
- _vm->_interface->setStatusText("");
- _vm->_interface->setSaveReminderState(0);
- _vm->_interface->rememberMode();
- if (_cutAwayMode == kPanelVideo)
- _vm->_interface->setMode(kPanelVideo);
- else
- _vm->_interface->setMode(kPanelCutaway);
- _cutawayActive = true;
+ if (!_cutawayActive) {
+ _vm->_gfx->showCursor(false);
+ _vm->_interface->setStatusText("");
+ _vm->_interface->setSaveReminderState(0);
+ _vm->_interface->rememberMode();
+ if (_cutAwayMode == kPanelVideo)
+ _vm->_interface->setMode(kPanelVideo);
+ else
+ _vm->_interface->setMode(kPanelCutaway);
+ _cutawayActive = true;
+ } else {
+ // If another cutaway is up, start the next cutaway immediately
+ startImmediately = true;
+ }
// Set the initial background and palette for the cutaway
ResourceContext *context = _vm->_resource->getContext(GAME_RESOURCEFILE);
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