Added a working CLEAR_BLACK to pie_ScreenFlip, and modified the videoLoop to always use CLEAR_BLACK. This fixes the fog coloured
(orange) backgrounds for the briefing "video's". git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1193 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
330fa3b3e5
commit
2ba3e85686
|
@ -134,6 +134,10 @@ void pie_ScreenFlip(CLEAR_MODE clearMode) {
|
|||
case CLEAR_OFF_AND_NO_BUFFER_DOWNLOAD:
|
||||
break;
|
||||
case CLEAR_BLACK:
|
||||
glDepthMask(GL_TRUE);
|
||||
glClearColor(0.0f,0.0f,0.0f,0.0f);
|
||||
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
|
||||
break;
|
||||
default:
|
||||
glDepthMask(GL_TRUE);
|
||||
fog_colour.argb = pie_GetFogColour();
|
||||
|
|
12
src/loop.c
12
src/loop.c
|
@ -924,7 +924,6 @@ GAMECODE gameLoop(void)
|
|||
GAMECODE videoLoop(void)
|
||||
{
|
||||
BOOL bVolKilled = FALSE;
|
||||
CLEAR_MODE bClear;
|
||||
|
||||
// There is something really odd here. - Per
|
||||
static BOOL bActiveBackDrop = FALSE;
|
||||
|
@ -934,11 +933,9 @@ GAMECODE videoLoop(void)
|
|||
screen_GetBackDrop();//test only remove JPS feb26
|
||||
#endif
|
||||
|
||||
bClear = CLEAR_OFF;
|
||||
|
||||
if (video)
|
||||
{
|
||||
bQuitVideo = !seq_UpdateFullScreenVideo(&bClear);
|
||||
bQuitVideo = !seq_UpdateFullScreenVideo(NULL);
|
||||
}
|
||||
|
||||
if ( (keyPressed(KEY_ESC) || bQuitVideo) && !seq_AnySeqLeft() )
|
||||
|
@ -1040,7 +1037,6 @@ GAMECODE videoLoop(void)
|
|||
|
||||
if( clearCount < 1)
|
||||
{
|
||||
bClear = CLEAR_BLACK;
|
||||
if (screen_GetBackDrop())
|
||||
{
|
||||
bActiveBackDrop = TRUE;
|
||||
|
@ -1052,14 +1048,10 @@ GAMECODE videoLoop(void)
|
|||
screen_StopBackDrop();
|
||||
}
|
||||
}
|
||||
else if( clearCount < 2)
|
||||
{
|
||||
bClear = CLEAR_BLACK;
|
||||
}
|
||||
|
||||
clearCount++;
|
||||
|
||||
pie_ScreenFlip(bClear);// videoloopflip
|
||||
pie_ScreenFlip(CLEAR_BLACK);// videoloopflip
|
||||
|
||||
/* restore volume after video quit */
|
||||
if ( bVolKilled == TRUE )
|
||||
|
|
Loading…
Reference in New Issue