OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'ec58178695' into scripting

Browse source 
Conflicts:
	src/p_enemy.cpp
	src/p_enemy.h
	wadsrc/static/actors/constants.txt

(Scripting branch update part 1)
This commit is contained in:
Christoph Oelckers 2015-04-28 09:34:51 +02:00
commit 56989d3422
19 changed files with 170 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/d_net.cpp
View file

@ -951,7 +951,7 @@ void NetUpdate (void)
newtics = nowtime - gametime;
gametime = nowtime;
if (newtics <= 0 || pauseext) // nothing new to update or window paused
if (newtics <= 0) // nothing new to update
{
GetPackets ();
return;
@ -1810,6 +1810,7 @@ void TryRunTics (void)
// If paused, do not eat more CPU time than we need, because it
// will all be wasted anyway.
if (pauseext) r_NoInterpolate = true;
bool doWait = cl_capfps || r_NoInterpolate /*|| netgame*/;
// get real tics
@ -1934,7 +1935,7 @@ void TryRunTics (void)
C_Ticker ();
M_Ticker ();
I_GetTime (true);
G_Ticker ();
if (!pauseext) G_Ticker();
gametic++;
NetUpdate (); // check for new console commands