OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit '67e3106254'

Browse source 
# Conflicts:
#	src/doomdata.h
#	src/namedef.h
#	src/p_udmf.cpp
This commit is contained in:
Christoph Oelckers 2018-01-20 19:07:54 +01:00
commit dbf0a68b02
13 changed files with 358 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/p_mobj.cpp
View file

@ -108,6 +108,7 @@
#include "a_morph.h"
#include "events.h"
#include "actorinlines.h"
#include "a_dynlight.h"
// MACROS ------------------------------------------------------------------
@ -6003,6 +6004,8 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
}
}
// spawn it
double sz;
@ -6091,6 +6094,12 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
mobj->fillcolor = (mthing->fillcolor & 0xffffff) | (ColorMatcher.Pick((mthing->fillcolor & 0xff0000) >> 16,
(mthing->fillcolor & 0xff00) >> 8, (mthing->fillcolor & 0xff)) << 24);
if (i->IsDescendantOf(RUNTIME_CLASS(ADynamicLight)))
{
((ADynamicLight*)mobj)->SpotInnerAngle = mthing->SpotInnerAngle;
((ADynamicLight*)mobj)->SpotOuterAngle = mthing->SpotOuterAngle;
}
mobj->CallBeginPlay ();
if (!(mobj->ObjectFlags & OF_EuthanizeMe))
{