diff options
| author | Sven Hesse | 2009-06-06 21:41:22 +0000 |
|---|---|---|
| committer | Sven Hesse | 2009-06-06 21:41:22 +0000 |
| commit | ebc9e38ed04a344e8b4438b120916f7dba809ef5 (patch) | |
| tree | fdbd2671bcd476be113c4d3cba9f1b013573e1a6 /engines | |
| parent | 3d3da173b05a6a45ea909aca790bd04c2286dd88 (diff) | |
| download | scummvm-rg350-ebc9e38ed04a344e8b4438b120916f7dba809ef5.tar.gz scummvm-rg350-ebc9e38ed04a344e8b4438b120916f7dba809ef5.tar.bz2 scummvm-rg350-ebc9e38ed04a344e8b4438b120916f7dba809ef5.zip | |
Fixing the Woodruff intro: Using a flag that's /not/ already used be the scripts
svn-id: r41306
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/videoplayer.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/videoplayer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index fccda1a859..514d4bf71b 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -227,7 +227,7 @@ bool VideoPlayer::findFile(char *fileName, Type &which) { } bool VideoPlayer::primaryOpen(const char *videoFile, int16 x, int16 y, - int16 flags, Type which) { + int32 flags, Type which) { char fileName[256]; diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h index 086173dd66..842426f90a 100644 --- a/engines/gob/videoplayer.h +++ b/engines/gob/videoplayer.h @@ -45,7 +45,7 @@ public: kFlagFrontSurface = 0x80, kFlagNoVideo = 0x100, kFlagOtherSurface = 0x800, - kFlagScreenSurface = 0x1000 + kFlagScreenSurface = 0x400000 }; enum Type { @@ -59,7 +59,7 @@ public: ~VideoPlayer(); bool primaryOpen(const char *videoFile, int16 x = -1, int16 y = -1, - int16 flags = kFlagFrontSurface, Type which = kVideoTypeTry); + int32 flags = kFlagFrontSurface, Type which = kVideoTypeTry); bool primaryPlay(int16 startFrame = -1, int16 lastFrame = -1, int16 breakKey = 27, uint16 palCmd = 8, int16 palStart = 0, int16 palEnd = 255, int16 palFrame = -1, int16 endFrame = -1, bool fade = false, |