mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-21 01:05:59 +00:00
Fixing the Woodruff intro: Using a flag that's /not/ already used be the scripts
svn-id: r41306
This commit is contained in:
parent
3d3da173b0
commit
ebc9e38ed0
@ -227,7 +227,7 @@ bool VideoPlayer::findFile(char *fileName, Type &which) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool VideoPlayer::primaryOpen(const char *videoFile, int16 x, int16 y,
|
bool VideoPlayer::primaryOpen(const char *videoFile, int16 x, int16 y,
|
||||||
int16 flags, Type which) {
|
int32 flags, Type which) {
|
||||||
|
|
||||||
char fileName[256];
|
char fileName[256];
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ public:
|
|||||||
kFlagFrontSurface = 0x80,
|
kFlagFrontSurface = 0x80,
|
||||||
kFlagNoVideo = 0x100,
|
kFlagNoVideo = 0x100,
|
||||||
kFlagOtherSurface = 0x800,
|
kFlagOtherSurface = 0x800,
|
||||||
kFlagScreenSurface = 0x1000
|
kFlagScreenSurface = 0x400000
|
||||||
};
|
};
|
||||||
|
|
||||||
enum Type {
|
enum Type {
|
||||||
@ -59,7 +59,7 @@ public:
|
|||||||
~VideoPlayer();
|
~VideoPlayer();
|
||||||
|
|
||||||
bool primaryOpen(const char *videoFile, int16 x = -1, int16 y = -1,
|
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,
|
bool primaryPlay(int16 startFrame = -1, int16 lastFrame = -1, int16 breakKey = 27,
|
||||||
uint16 palCmd = 8, int16 palStart = 0, int16 palEnd = 255,
|
uint16 palCmd = 8, int16 palStart = 0, int16 palEnd = 255,
|
||||||
int16 palFrame = -1, int16 endFrame = -1, bool fade = false,
|
int16 palFrame = -1, int16 endFrame = -1, bool fade = false,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user