stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 15:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary function parameters from title card code

Browse source
This commit is contained in:
Jaime Passos 2019-12-05 01:58:19 -03:00
parent e6f1b82cc4
commit c0cc742fb8
6 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

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

5
src/g_game.c
View file

@ -1828,7 +1828,7 @@ void G_StartTitleCard(void)
// //
// Run the title card before fading in to the level. // Run the title card before fading in to the level.
// //
void G_PreLevelTitleCard(tic_t ticker, boolean update) void G_PreLevelTitleCard(void)
{ {
tic_t starttime = I_GetTime(); tic_t starttime = I_GetTime();
tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO); tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
@ -1842,7 +1842,8 @@ void G_PreLevelTitleCard(tic_t ticker, boolean update)
lasttime = nowtime; lasttime = nowtime;
ST_runTitleCard(); ST_runTitleCard();
ST_preLevelTitleCardDrawer(ticker, update); ST_preLevelTitleCardDrawer();
I_FinishUpdate(); // page flip or blit buffer
if (moviemode) if (moviemode)
M_SaveFrame(); M_SaveFrame();

2
src/g_game.h
View file

@ -141,7 +141,7 @@ void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar,
boolean SSSG, boolean FLS); boolean SSSG, boolean FLS);
void G_DoLoadLevel(boolean resetplayer); void G_DoLoadLevel(boolean resetplayer);
void G_StartTitleCard(void); void G_StartTitleCard(void);
void G_PreLevelTitleCard(tic_t ticker, boolean update); void G_PreLevelTitleCard(void);
void G_DeferedPlayDemo(const char *demo); void G_DeferedPlayDemo(const char *demo);
// Can be called by the startup code or M_Responder, calls P_SetupLevel. // Can be called by the startup code or M_Responder, calls P_SetupLevel.

2
src/p_setup.c
View file

@ -3267,7 +3267,7 @@ boolean P_SetupLevel(boolean skipprecip)
// If so... // If so...
if ((!(mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)) && (*mapheaderinfo[gamemap-1]->lvlttl != '\0')) if ((!(mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)) && (*mapheaderinfo[gamemap-1]->lvlttl != '\0'))
G_PreLevelTitleCard(lt_ticker, true); G_PreLevelTitleCard();
return true; return true;
} }

6
src/st_stuff.c
View file

@ -1348,16 +1348,12 @@ luahook:
// //
// Drawer for G_PreLevelTitleCard. // Drawer for G_PreLevelTitleCard.
// //
void ST_preLevelTitleCardDrawer(tic_t ticker, boolean update) void ST_preLevelTitleCardDrawer(void)
{ {
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
if (ticker < PRELEVELTIME-1)
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(tic_t ticker, 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;