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

# Conflicts: # src/scripting/vmthunks_actors.cpp
ZDoom · Dec 5, 2018 · eb282c0 · eb282c0
2 parents 6c9d0b1 + 101ebe1
commit eb282c0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/scripting/vmthunks_actors.cpp b/src/scripting/vmthunks_actors.cpp
@@ -52,6 +52,7 @@
 #include "p_local.h"
 #include "p_effect.h"
 #include "p_spec.h"
+#include "actorinlines.h"
 
 DVector2 AM_GetPosition();
 int Net_GetLatency(int *ld, int *ad);