OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'edf-gl'

Browse source 
Conflicts:
	src/actor.h
	src/p_spec.cpp
This commit is contained in:
Christoph Oelckers 2016-01-12 00:02:17 +01:00
commit 7c8d48bbfc
10 changed files with 970 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/p_spec.cpp
View file

@ -63,6 +63,9 @@
#include "a_keys.h"
#include "c_dispatch.h"
#include "r_sky.h"
#ifndef NO_EDF
#include "edf.h"
#endif
// State.
#include "r_state.h"
@ -1365,6 +1368,7 @@ void P_SpawnSpecials (void)
// Init special SECTORs.
sector = sectors;
for (i = 0; i < numsectors; i++, sector++)
{
if (sector->special == 0)
@ -1372,6 +1376,11 @@ void P_SpawnSpecials (void)
P_InitSectorSpecial(sector, sector->special, false);
}
#ifndef NO_EDF
ProcessEDFSectors();
#endif
// Init other misc stuff