OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/crimsondusk/zdoom

Browse source 
Conflicts:
	src/actor.h
This commit is contained in:
Christoph Oelckers 2015-04-30 10:03:50 +02:00
commit 84351419a3
20 changed files with 256 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_acs.cpp
View file

@ -3350,7 +3350,7 @@ int DLevelScript::DoSpawn (int type, fixed_t x, fixed_t y, fixed_t z, int tid, i
actor = Spawn (info, x, y, z, ALLOW_REPLACE);
if (actor != NULL)
{
DWORD oldFlags2 = actor->flags2;
ActorFlags2 oldFlags2 = actor->flags2;
actor->flags2 |= MF2_PASSMOBJ;
if (force || P_TestMobjLocation (actor))
{