[Scummvm-cvs-logs] SF.net SVN: scummvm: [32737] scummvm/trunk/engines/gob/scenery.cpp

[drmccoy at users.sourceforge.net]

Revision: 32737
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32737&view=rev
Author:   drmccoy
Date:     2008-06-19 09:27:49 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Only try playing object videos when the game version supports that (only Woodruff, for now)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/scenery.cpp

Modified: scummvm/trunk/engines/gob/scenery.cpp
===================================================================
--- scummvm/trunk/engines/gob/scenery.cpp	2008-06-19 12:21:56 UTC (rev 32736)
+++ scummvm/trunk/engines/gob/scenery.cpp	2008-06-19 16:27:49 UTC (rev 32737)
@@ -595,7 +595,7 @@
 	int16 destX;
 	int16 destY;
 
-	if (animation < 0) {
+	if ((_vm->getGameType() == kGameTypeWoodruff) && (animation < 0)) {
 		// Object video
 
 		if (flags & 1) { // Do capture
@@ -736,6 +736,8 @@
 		return;
 	}
 
+	if ((animation < 0) || (animation >= 10))
+		return;
 	if ((_animPictCount[animation] == 0) || (layer < 0))
 		return;
 	if (layer >= _animations[animation].layersCount)


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