OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of c:\programming\doom-dev\zdoom

Browse source 
# Conflicts:
#	.gitignore
This commit is contained in:
Christoph Oelckers 2016-02-16 21:02:13 +01:00
commit 56202c49f1
84 changed files with 1245 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_spec.cpp
View file

@ -46,6 +46,8 @@
#include "w_wad.h"
#include "p_local.h"
#include "p_spec.h"
#include "p_blockmap.h"
#include "p_lnspec.h"
#include "p_terrain.h"
#include "p_acs.h"
@ -64,7 +66,10 @@
#include "a_keys.h"
#include "c_dispatch.h"
#include "r_sky.h"
#include "d_player.h"
#include "portal.h"
#include "p_maputl.h"
#include "p_blockmap.h"
#ifndef NO_EDATA
#include "edata.h"
#endif