adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix for #734 + small cleanup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2676 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2007-01-19 06:48:06 +00:00
parent d54345bf94
commit 5e055e5003
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.7: Changes towards version 0.7:
- DUCK videos now play correctly after a video mode change; bug #734 - Alex
- Cancel key will now quit out of the Manifest Menu (Bug #838) - Michael - Cancel key will now quit out of the Manifest Menu (Bug #838) - Michael
- Added -w and -x commandline options, to counter -f and -o; used these - Added -w and -x commandline options, to counter -f and -o; used these
to implement "Safe Mode" links in the Win32 installer (Bug #946) to implement "Safe Mode" links in the Win32 installer (Bug #946)
sc2/src/sc2code/cleanup.c
+1 -1
View File
@@ -53,7 +53,7 @@ FreeKernel (void)
DestroyDrawable (ReleaseDrawable (Screen)); DestroyDrawable (ReleaseDrawable (Screen));
DestroyContext (ReleaseContext (ScreenContext)); DestroyContext (ReleaseContext (ScreenContext));
UninitVideo (); UninitVideoPlayer ();
UninitSound (); UninitSound ();
UninitGraphics (); UninitGraphics ();
} }
sc2/src/sc2code/libs/video/video.c
+2 -2
View File
@@ -25,7 +25,7 @@
static VIDEO_REF _cur_video = NULL_VIDEO_REF; static VIDEO_REF _cur_video = NULL_VIDEO_REF;
BOOLEAN BOOLEAN
InitVideo (BOOLEAN useCDROM) InitVideoPlayer (BOOLEAN useCDROM)
//useCDROM doesn't really apply to us //useCDROM doesn't really apply to us
{ {
TFB_PixelFormat fmt; TFB_PixelFormat fmt;
@@ -41,7 +41,7 @@ InitVideo (BOOLEAN useCDROM)
} }
void void
UninitVideo () UninitVideoPlayer (void)
{ {
TFB_UninitVideoPlayer (); TFB_UninitVideoPlayer ();
VideoDecoder_Uninit (); VideoDecoder_Uninit ();
sc2/src/sc2code/libs/vidlib.h
+2 -7
View File
@@ -28,15 +28,10 @@ typedef enum
SOFTWARE_FMV SOFTWARE_FMV
} VIDEO_TYPE; } VIDEO_TYPE;
#define MODES_UNDEFINED ((BYTE)~0)
typedef DWORD VIDEO_REF; typedef DWORD VIDEO_REF;
extern BOOLEAN InitVideo (BOOLEAN UseCDROM); extern BOOLEAN InitVideoPlayer (BOOLEAN UseCDROM);
extern void UninitVideo (void); extern void UninitVideoPlayer (void);
extern BYTE SetVideoMode (BYTE new_mode);
extern BYTE GetVideoMode (void);
extern VIDEO_REF LoadVideoFile (const char *pStr); extern VIDEO_REF LoadVideoFile (const char *pStr);
extern BOOLEAN DestroyVideo (VIDEO_REF VideoRef); extern BOOLEAN DestroyVideo (VIDEO_REF VideoRef);
sc2/src/sc2code/setup.c
+1 -1
View File
@@ -96,7 +96,7 @@ LoadKernel (int argc, char *argv[])
if (!InitGraphics (argc, argv, MIN_K_REQUIRED)) if (!InitGraphics (argc, argv, MIN_K_REQUIRED))
return FALSE; return FALSE;
InitSound (argc, argv); InitSound (argc, argv);
InitVideo (TRUE); InitVideoPlayer (TRUE);
ScreenContext = CaptureContext (CreateContext ()); ScreenContext = CaptureContext (CreateContext ());
if (ScreenContext == NULL) if (ScreenContext == NULL)
sc2/src/sc2code/setupmenu.c
+2
View File
@@ -1289,8 +1289,10 @@ SetGlobalOptions (GLOBALOPTS *opts)
(NewGfxFlags != GfxFlags)) (NewGfxFlags != GfxFlags))
{ {
FlushGraphics (); FlushGraphics ();
UninitVideoPlayer ();
TFB_DrawScreen_ReinitVideo (NewDriver, NewGfxFlags, NewWidth, NewHeight); TFB_DrawScreen_ReinitVideo (NewDriver, NewGfxFlags, NewWidth, NewHeight);
FlushGraphics (); FlushGraphics ();
InitVideoPlayer (TRUE);
} }
optSubtitles = (opts->subtitles == OPTVAL_ENABLED) ? TRUE : FALSE; optSubtitles = (opts->subtitles == OPTVAL_ENABLED) ? TRUE : FALSE;
// optWhichMusic = (opts->music == OPTVAL_3DO) ? OPT_3DO : OPT_PC; // optWhichMusic = (opts->music == OPTVAL_3DO) ? OPT_3DO : OPT_PC;