Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts

This commit is contained in:
Monster Iestyn 2018-08-29 22:07:38 +01:00
parent d9440f419c
commit 46be411454
2 changed files with 1 additions and 4 deletions

View file

@ -283,7 +283,7 @@ static void D_Display(void)
if (rendermode != render_none) if (rendermode != render_none)
{ {
// Fade to black first // 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) && wipedefs[wipedefindex] != UINT8_MAX)
{ {
F_WipeStartScreen(); F_WipeStartScreen();

View file

@ -4956,9 +4956,6 @@ static void M_DrawAddons(void)
return; return;
} }
if (addonsresponselimit)
addonsresponselimit--;
if (Playing()) if (Playing())
topstr = "\x85""Adding files mid-game may cause problems."; topstr = "\x85""Adding files mid-game may cause problems.";
else if (savemoddata) else if (savemoddata)