OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- first stage of migrating intermissions to screenjobs.

Browse source
This commit is contained in:
Christoph Oelckers 2022-04-10 08:54:45 +02:00
commit 390bf58698
15 changed files with 171 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/d_net.cpp
View file

@ -68,6 +68,7 @@
#include "vm.h"
#include "gstrings.h"
#include "s_music.h"
#include "screenjob.h"
EXTERN_CVAR (Int, disableautosave)
EXTERN_CVAR (Int, autosavecount)
@ -1851,7 +1852,7 @@ void TryRunTics (void)
int counts;
int numplaying;
bool doWait = (cl_capfps || pauseext || (r_NoInterpolate && !M_IsAnimated() /*&& gamestate != GS_INTERMISSION && gamestate != GS_INTRO*/));
bool doWait = (cl_capfps || pauseext || (r_NoInterpolate && !M_IsAnimated()));
// get real tics
if (doWait)
@ -2696,10 +2697,6 @@ void Net_DoCommand (int type, uint8_t **stream, int player)
players[player].MaxPitch = (double)ReadByte(stream); // down
break;
case DEM_ADVANCEINTER:
F_AdvanceIntermission();
break;
case DEM_REVERTCAMERA:
players[player].camera = players[player].mo;
break;
@ -2721,6 +2718,10 @@ void Net_DoCommand (int type, uint8_t **stream, int player)
}
break;
case DEM_ENDSCREENJOB:
EndScreenJob();
break;
default:
I_Error ("Unknown net command: %d", type);
break;