aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-11-01 23:39:55 +0000
committerTravis Howell2006-11-01 23:39:55 +0000
commitc3f6c576806cfba9c46ddf0eedaf6cd9cef4cc06 (patch)
treed8b88e20378b0878f5bcb9afc173b75ce120a4a1
parentc718463a24b1f49745b3f4201f11bb7dc5697b87 (diff)
downloadscummvm-rg350-c3f6c576806cfba9c46ddf0eedaf6cd9cef4cc06.tar.gz
scummvm-rg350-c3f6c576806cfba9c46ddf0eedaf6cd9cef4cc06.tar.bz2
scummvm-rg350-c3f6c576806cfba9c46ddf0eedaf6cd9cef4cc06.zip
Enable Bink video playback in HE100 games
svn-id: r24584
-rw-r--r--engines/scumm/he/script_v100he.cpp9
-rw-r--r--engines/scumm/vars.cpp4
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 0001d539fd..0a693c69bb 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -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 @@ void ScummEngine_v100he::o100_videoOps() {
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
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 0064b50d77..70284e0edf 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -330,6 +330,10 @@ void ScummEngine_v90he::setupScummVars() {
VAR_NUM_PALETTES = 130;
VAR_NUM_UNK = 131;
}
+ if (_game.heversion >= 100) {
+ // Enable Bink video
+ VAR(140) = 1;
+ }
}
#endif