[Scummvm-cvs-logs] SF.net SVN: scummvm:[41306] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sat Jun 6 23:41:22 CEST 2009
Revision: 41306
http://scummvm.svn.sourceforge.net/scummvm/?rev=41306&view=rev
Author: drmccoy
Date: 2009-06-06 21:41:22 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
Fixing the Woodruff intro: Using a flag that's /not/ already used be the scripts
Modified Paths:
--------------
scummvm/trunk/engines/gob/videoplayer.cpp
scummvm/trunk/engines/gob/videoplayer.h
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2009-06-06 21:37:30 UTC (rev 41305)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2009-06-06 21:41:22 UTC (rev 41306)
@@ -227,7 +227,7 @@
}
bool VideoPlayer::primaryOpen(const char *videoFile, int16 x, int16 y,
- int16 flags, Type which) {
+ int32 flags, Type which) {
char fileName[256];
Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h 2009-06-06 21:37:30 UTC (rev 41305)
+++ scummvm/trunk/engines/gob/videoplayer.h 2009-06-06 21:41:22 UTC (rev 41306)
@@ -45,7 +45,7 @@
kFlagFrontSurface = 0x80,
kFlagNoVideo = 0x100,
kFlagOtherSurface = 0x800,
- kFlagScreenSurface = 0x1000
+ kFlagScreenSurface = 0x400000
};
enum Type {
@@ -59,7 +59,7 @@
~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,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list