zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom 

# Conflicts:
#	src/scripting/vmthunks_actors.cpp
This commit is contained in:
Christoph Oelckers 2018-12-05 17:34:53 +01:00
parent 6c9d0b166a 101ebe1731
commit eb282c0d11
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scripting/vmthunks_actors.cpp
View File

@ -52,6 +52,7 @@
#include "p_local.h" #include "p_local.h"
#include "p_effect.h" #include "p_effect.h"
#include "p_spec.h" #include "p_spec.h"
#include "actorinlines.h"
DVector2 AM_GetPosition(); DVector2 AM_GetPosition();
int Net_GetLatency(int *ld, int *ad); int Net_GetLatency(int *ld, int *ad);