Merge win32/win_vid.c

This commit is contained in:
SteelT 2020-08-10 15:41:39 -04:00
parent a93282d893
commit 7ad5057fe9

View file

@ -300,11 +300,6 @@ static inline boolean I_SkipFrame(void)
return false; return false;
/* FALLTHRU */ /* FALLTHRU */
//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible //case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
<<<<<<< HEAD
=======
#ifndef NONET
>>>>>>> srb2/next
/* FALLTHRU */
case GS_WAITINGPLAYERS: case GS_WAITINGPLAYERS:
return skip; // Skip odd frames return skip; // Skip odd frames
default: default: