lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2

Browse source
This commit is contained in:
Jaime Passos 2019-12-05 02:03:09 -03:00
parent b5d5749bfb c0cc742fb8
commit 13c6b38b13
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -497,7 +497,7 @@ static void D_Display(void)
{ {
lt_ticker--; lt_ticker--;
lt_lasttic = lt_ticker; lt_lasttic = lt_ticker;
ST_preLevelTitleCardDrawer(false); ST_preLevelTitleCardDrawer();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
F_WipeStartScreen(); F_WipeStartScreen();
} }

3
src/g_game.c
View file

@ -1839,7 +1839,8 @@ void G_PreLevelTitleCard(void)
lasttime = nowtime; lasttime = nowtime;
ST_runTitleCard(); ST_runTitleCard();
ST_preLevelTitleCardDrawer(true); ST_preLevelTitleCardDrawer();
I_FinishUpdate(); // page flip or blit buffer
if (moviemode) if (moviemode)
M_SaveFrame(); M_SaveFrame();

5
src/st_stuff.c
View file

@ -1348,15 +1348,12 @@ luahook:
// //
// Drawer for G_PreLevelTitleCard. // Drawer for G_PreLevelTitleCard.
// //
void ST_preLevelTitleCardDrawer(boolean update) void ST_preLevelTitleCardDrawer(void)
{ {
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
ST_drawWipeTitleCard(); ST_drawWipeTitleCard();
I_OsPolling(); I_OsPolling();
I_UpdateNoBlit(); I_UpdateNoBlit();
if (update)
I_FinishUpdate(); // page flip or blit buffer
} }
// //

2
src/st_stuff.h
View file

@ -52,7 +52,7 @@ void ST_startTitleCard(void);
void ST_runTitleCard(void); void ST_runTitleCard(void);
void ST_drawTitleCard(void); void ST_drawTitleCard(void);
void ST_preDrawTitleCard(void); void ST_preDrawTitleCard(void);
void ST_preLevelTitleCardDrawer(boolean update); void ST_preLevelTitleCardDrawer(void);
void ST_drawWipeTitleCard(void); void ST_drawWipeTitleCard(void);
extern tic_t lt_ticker, lt_lasttic; extern tic_t lt_ticker, lt_lasttic;