mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-04-07 10:34:48 +00:00
Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts
This commit is contained in:
parent
7db7a739d4
commit
ceb0abb081
2 changed files with 1 additions and 4 deletions
|
@ -283,7 +283,7 @@ static void D_Display(void)
|
|||
if (rendermode != render_none)
|
||||
{
|
||||
// Fade to black first
|
||||
if ((wipegamestate != -2) // fades to black on its own timing, always
|
||||
if ((wipegamestate != (gamestate_t)-2) // fades to black on its own timing, always
|
||||
&& wipedefs[wipedefindex] != UINT8_MAX)
|
||||
{
|
||||
F_WipeStartScreen();
|
||||
|
|
|
@ -4956,9 +4956,6 @@ static void M_DrawAddons(void)
|
|||
return;
|
||||
}
|
||||
|
||||
if (addonsresponselimit)
|
||||
addonsresponselimit--;
|
||||
|
||||
if (Playing())
|
||||
topstr = "\x85""Adding files mid-game may cause problems.";
|
||||
else if (savemoddata)
|
||||
|
|
Loading…
Reference in a new issue