[Scummvm-cvs-logs] SF.net SVN: scummvm: [27408] scummvm/trunk/engines/saga/animation.cpp

[thebluegr at users.sourceforge.net]

Revision: 27408
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27408&view=rev
Author:   thebluegr
Date:     2007-06-14 19:29:08 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
It's normal for cutaways to only have 1 frame

Modified Paths:
--------------
    scummvm/trunk/engines/saga/animation.cpp

Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp	2007-06-15 02:26:30 UTC (rev 27407)
+++ scummvm/trunk/engines/saga/animation.cpp	2007-06-15 02:29:08 UTC (rev 27408)
@@ -66,8 +66,6 @@
 	for (int i = 0; i < _cutawayListLength; i++) {
 		_cutawayList[i].backgroundResourceId = cutawayS.readUint16LE();
 		_cutawayList[i].animResourceId = cutawayS.readUint16LE();
-		if (_cutawayList[i].animResourceId == 0)
-			warning("Anim::loadCutawayList: Animation %i has an animResourceId equal to 0", i);
 		_cutawayList[i].cycles = cutawayS.readSint16LE();
 		_cutawayList[i].frameRate = cutawayS.readSint16LE();
 	}
@@ -163,12 +161,13 @@
 		return;
 	}
 	
-	// FIXME: Some animations in IHNM have animResourceId equal to 0, for no obvious reason
-	// We skip them, to avoid ScummVM crashing
-	if (_cutawayList[cut].animResourceId == 0) {
-		warning("Anim::playCutaway: Animation %i has animResourceId equal to 0, skipping", cut);
+	// Some cutaways in IHNM have animResourceId equal to 0, which means that they only have
+	// a background frame and no animation. Those animations are actually game scripts.
+	// An example is the "nightfall" animation in Ben's chapter (fadein-fadeout), the animation
+	// for the second from the left monitor in Ellen's chapter etc
+	// Therefore, skip the animation bit if animResourceId is 0 and only show the background
+	if (_cutawayList[cut].animResourceId == 0)
 		return;
-	}
 
 	_vm->_resource->loadResource(context, _cutawayList[cut].animResourceId, resourceData, resourceDataLength);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.