From c0cc742fb8218df201ce121e6e90afe61c7c30d9 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Thu, 5 Dec 2019 01:58:19 -0300
Subject: [PATCH] Remove unnecessary function parameters from title card code
---
src/d_main.c | 2 +-
src/g_game.c | 5 +++--
src/g_game.h | 2 +-
src/p_setup.c | 2 +-
src/st_stuff.c | 8 ++------
src/st_stuff.h | 2 +-
6 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 5853fccf0..c1feda2c1 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -493,7 +493,7 @@ static void D_Display(void)
{
lt_ticker--;
lt_lasttic = lt_ticker;
- ST_preLevelTitleCardDrawer(0, false);
+ ST_preLevelTitleCardDrawer();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
F_WipeStartScreen();
}
diff --git a/src/g_game.c b/src/g_game.c
index b754e88ae..418aa526d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1828,7 +1828,7 @@ void G_StartTitleCard(void)
//
// 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 endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
@@ -1842,7 +1842,8 @@ void G_PreLevelTitleCard(tic_t ticker, boolean update)
lasttime = nowtime;
ST_runTitleCard();
- ST_preLevelTitleCardDrawer(ticker, update);
+ ST_preLevelTitleCardDrawer();
+ I_FinishUpdate(); // page flip or blit buffer
if (moviemode)
M_SaveFrame();
diff --git a/src/g_game.h b/src/g_game.h
index 0a575c099..b4898a68f 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -141,7 +141,7 @@ void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar,
boolean SSSG, boolean FLS);
void G_DoLoadLevel(boolean resetplayer);
void G_StartTitleCard(void);
-void G_PreLevelTitleCard(tic_t ticker, boolean update);
+void G_PreLevelTitleCard(void);
void G_DeferedPlayDemo(const char *demo);
// Can be called by the startup code or M_Responder, calls P_SetupLevel.
diff --git a/src/p_setup.c b/src/p_setup.c
index 25139bf2b..1ae0119e5 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3267,7 +3267,7 @@ boolean P_SetupLevel(boolean skipprecip)
// If so...
if ((!(mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)) && (*mapheaderinfo[gamemap-1]->lvlttl != '\0'))
- G_PreLevelTitleCard(lt_ticker, true);
+ G_PreLevelTitleCard();
return true;
}
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 3a8a4d2f1..f63149848 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1348,16 +1348,12 @@ luahook:
//
// Drawer for G_PreLevelTitleCard.
//
-void ST_preLevelTitleCardDrawer(tic_t ticker, boolean update)
+void ST_preLevelTitleCardDrawer(void)
{
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
- if (ticker < PRELEVELTIME-1)
- ST_drawWipeTitleCard();
-
+ ST_drawWipeTitleCard();
I_OsPolling();
I_UpdateNoBlit();
- if (update)
- I_FinishUpdate(); // page flip or blit buffer
}
//
diff --git a/src/st_stuff.h b/src/st_stuff.h
index 33ffa957a..430d29a0d 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -52,7 +52,7 @@ void ST_startTitleCard(void);
void ST_runTitleCard(void);
void ST_drawTitleCard(void);
void ST_preDrawTitleCard(void);
-void ST_preLevelTitleCardDrawer(tic_t ticker, boolean update);
+void ST_preLevelTitleCardDrawer(void);
void ST_drawWipeTitleCard(void);
extern tic_t lt_ticker, lt_lasttic;
--
GitLab