[Scummvm-cvs-logs] SF.net SVN: scummvm: [24584] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 24584
          http://svn.sourceforge.net/scummvm/?rev=24584&view=rev
Author:   kirben
Date:     2006-11-01 15:39:55 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Enable Bink video playback in HE100 games

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v100he.cpp
    scummvm/trunk/engines/scumm/vars.cpp

Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-11-01 21:28:14 UTC (rev 24583)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-11-01 23:39:55 UTC (rev 24584)
@@ -27,6 +27,7 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
+#include "scumm/he/animation_he.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
@@ -2248,13 +2249,11 @@
 			if (_videoParams.flags == 0)
 				_videoParams.flags = 4;
 
-			//const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename);
+			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename);
 			if (_videoParams.flags == 2) {
-				// VAR(119) = startVideo(_videoParams.filename, _videoParams.flags, _videoParams.wizResNum);
-				VAR(119) = -1;
+				VAR(119) = _moviePlay->load(filename, _videoParams.flags, _videoParams.wizResNum);
 			} else {
-				// VAR(119) = startVideo(_videoParams.filename, _videoParams.flags);
-				VAR(119) = -1;
+				VAR(119) = _moviePlay->load(filename, _videoParams.flags);
 			}
 		} else if (_videoParams.status == 19) {
 			// Stop video

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2006-11-01 21:28:14 UTC (rev 24583)
+++ scummvm/trunk/engines/scumm/vars.cpp	2006-11-01 23:39:55 UTC (rev 24584)
@@ -330,6 +330,10 @@
 		VAR_NUM_PALETTES = 130;
 		VAR_NUM_UNK = 131;
 	}
+	if (_game.heversion >= 100) {
+		// Enable Bink video
+		VAR(140) = 1;
+	}
 }
 #endif
 


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