Merge branch 'zmaster'

This commit is contained in:
Christoph Oelckers 2016-02-16 22:07:43 +01:00
commit 7da9a0463b
2 changed files with 3 additions and 1 deletions

View file

@ -20,6 +20,7 @@
#include "v_font.h" #include "v_font.h"
#include "farchive.h" #include "farchive.h"
#include "p_spec.h" #include "p_spec.h"
#include "portal.h"
// Include all the other Strife stuff here to reduce compile time // Include all the other Strife stuff here to reduce compile time
#include "a_acolyte.cpp" #include "a_acolyte.cpp"

View file

@ -34,7 +34,7 @@
#include "doomstat.h" #include "doomstat.h"
#include "m_random.h" #include "m_random.h"
#include "m_bbox.h" #include "m_bbox.h"
#include "p_local.h" #include "portal.h"
#include "r_sky.h" #include "r_sky.h"
#include "st_stuff.h" #include "st_stuff.h"
#include "c_cvars.h" #include "c_cvars.h"
@ -57,6 +57,7 @@
#include "farchive.h" #include "farchive.h"
#include "r_utility.h" #include "r_utility.h"
#include "d_player.h" #include "d_player.h"
#include "portal.h"
// EXTERNAL DATA DECLARATIONS ---------------------------------------------- // EXTERNAL DATA DECLARATIONS ----------------------------------------------