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

src/b_game.cpp

@@ -93,6 +93,7 @@ Everything that is changed is marked (maybe commented) with "Added by MC"
 #include "events.h"
 #include "vm.h"
 #include "g_levellocals.h"
+#include "actorinlines.h"
 
 static FRandom pr_botspawn ("BotSpawn");
 

src/r_data/models/models.cpp

@@ -42,6 +42,7 @@
 #include "r_data/models/models_ue1.h"
 #include "r_data/models/models_obj.h"
 #include "i_time.h"
+#include "actorinlines.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4244) // warning C4244: conversion from 'double' to 'float', possible loss of data

src/s_advsound.cpp

@@ -47,6 +47,7 @@
 #include "g_levellocals.h"
 #include "r_data/sprites.h"
 #include "vm.h"
+#include "actorinlines.h"
 
 // MACROS ------------------------------------------------------------------
 

src/scripting/thingdef_properties.cpp

@@ -54,6 +54,7 @@
 #include "a_keys.h"
 #include "g_levellocals.h"
 #include "types.h"
+#include "actorinlines.h"
 
 //==========================================================================
 //

src/v_blend.cpp

@@ -44,6 +44,7 @@
 #include "d_player.h"
 #include "g_levellocals.h"
 #include "vm.h"
+#include "actorinlines.h"
 
 CVAR( Float, blood_fade_scalar, 1.0f, CVAR_ARCHIVE )	// [SP] Pulled from Skulltag - changed default from 0.5 to 1.0
 CVAR( Float, pickup_fade_scalar, 1.0f, CVAR_ARCHIVE )	// [SP] Uses same logic as blood_fade_scalar except for pickups