Merge pull request #508 from ChillyDoom/wi_stuff-common-code

- Removed duplicate autoskip code.
This commit is contained in:
coelckers 2016-01-24 16:54:51 +01:00
commit 3c790a80eb

View file

@ -1096,6 +1096,11 @@ void WI_End ()
} }
} }
bool WI_autoSkip()
{
return wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE);
}
void WI_initNoState () void WI_initNoState ()
{ {
state = NoState; state = NoState;
@ -1114,7 +1119,7 @@ void WI_updateNoState ()
else else
{ {
bool noauto = noautostartmap; bool noauto = noautostartmap;
bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE)); bool autoskip = WI_autoSkip();
for (int i = 0; !noauto && i < MAXPLAYERS; ++i) for (int i = 0; !noauto && i < MAXPLAYERS; ++i)
{ {
@ -1254,7 +1259,7 @@ void WI_updateDeathmatchStats ()
int i; int i;
bool stillticking; bool stillticking;
bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE)); bool autoskip = WI_autoSkip();
WI_updateAnimatedBack(); WI_updateAnimatedBack();
@ -1506,7 +1511,7 @@ void WI_updateNetgameStats ()
int i; int i;
int fsum; int fsum;
bool stillticking; bool stillticking;
bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE)); bool autoskip = WI_autoSkip();
WI_updateAnimatedBack (); WI_updateAnimatedBack ();