mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 14:01:45 +00:00
Merge pull request #508 from ChillyDoom/wi_stuff-common-code
- Removed duplicate autoskip code.
This commit is contained in:
commit
3c790a80eb
1 changed files with 8 additions and 3 deletions
|
@ -1096,6 +1096,11 @@ void WI_End ()
|
|||
}
|
||||
}
|
||||
|
||||
bool WI_autoSkip()
|
||||
{
|
||||
return wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE);
|
||||
}
|
||||
|
||||
void WI_initNoState ()
|
||||
{
|
||||
state = NoState;
|
||||
|
@ -1114,7 +1119,7 @@ void WI_updateNoState ()
|
|||
else
|
||||
{
|
||||
bool noauto = noautostartmap;
|
||||
bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE));
|
||||
bool autoskip = WI_autoSkip();
|
||||
|
||||
for (int i = 0; !noauto && i < MAXPLAYERS; ++i)
|
||||
{
|
||||
|
@ -1254,7 +1259,7 @@ void WI_updateDeathmatchStats ()
|
|||
|
||||
int i;
|
||||
bool stillticking;
|
||||
bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE));
|
||||
bool autoskip = WI_autoSkip();
|
||||
|
||||
WI_updateAnimatedBack();
|
||||
|
||||
|
@ -1506,7 +1511,7 @@ void WI_updateNetgameStats ()
|
|||
int i;
|
||||
int fsum;
|
||||
bool stillticking;
|
||||
bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE));
|
||||
bool autoskip = WI_autoSkip();
|
||||
|
||||
WI_updateAnimatedBack ();
|
||||
|
||||
|
|
Loading…
Reference in a new issue