From 76488d835f850a135ee8aee006749385d03b8bf6 Mon Sep 17 00:00:00 2001 From: Jaime Passos Date: Thu, 14 Nov 2019 21:31:20 -0300 Subject: [PATCH] F_WipeColorFill --- src/d_main.c | 2 +- src/f_finale.h | 4 +++- src/f_wipe.c | 8 +------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index a8b96d651..47ecb5fbf 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -448,7 +448,7 @@ static void D_Display(void) framecount = 0; demostarttime = I_GetTime(); } - + wipetypepost = -1; } else diff --git a/src/f_finale.h b/src/f_finale.h index e096690a1..6fd94d9c0 100644 --- a/src/f_finale.h +++ b/src/f_finale.h @@ -166,12 +166,14 @@ extern wipestyleflags_t wipestyleflags; #define FADEGREENFACTOR 15 #define FADEBLUEFACTOR 10 +extern UINT8 wipecolorfill; + void F_WipeStartScreen(void); void F_WipeEndScreen(void); void F_RunWipe(UINT8 wipetype, boolean drawMenu); void F_WipeTicker(void); void F_WipeTitleCard(void); -void F_WipeColorFill(UINT8 color); +#define F_WipeColorFill(c) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (wipecolorfill = c)) tic_t F_GetWipeLength(UINT8 wipetype); boolean F_WipeExists(UINT8 wipetype); diff --git a/src/f_wipe.c b/src/f_wipe.c index 8b69f39ca..b5b60403e 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -103,7 +103,7 @@ static fixed_t paldiv = 0; static UINT8 curwipetype; static UINT8 curwipeframe; -static UINT8 wipecolorfill = 31; +UINT8 wipecolorfill = 31; /** Create fademask_t from lump * @@ -200,12 +200,6 @@ void F_WipeTitleCard(void) ST_drawLevelTitle(TICRATE); } -void F_WipeColorFill(UINT8 color) -{ - wipecolorfill = color; - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, wipecolorfill); -} - /** Wipe ticker * * \param fademask pixels to change