zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Preserve the MF_BLOCKED flag on level-spawned actors that have it in their default properties. 

SVN r3395 (trunk)
This commit is contained in:
Randy Heit 2012-02-28 01:54:35 +00:00
parent 1e21ebad5d
commit d59280eadb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/p_mobj.cpp
View File

@ -3691,8 +3691,15 @@ AActor *Spawn (FName classname, fixed_t x, fixed_t y, fixed_t z, replace_t allow
void AActor::LevelSpawned () void AActor::LevelSpawned ()
{ {
if (tics > 0 && !(flags4 & MF4_SYNCHRONIZED)) if (tics > 0 && !(flags4 & MF4_SYNCHRONIZED))
{
tics = 1 + (pr_spawnmapthing() % tics); tics = 1 + (pr_spawnmapthing() % tics);
flags &= ~MF_DROPPED; // [RH] clear MF_DROPPED flag }
// [RH] Clear MF_DROPPED flag if the default version doesn't have it set.
// (AInventory::BeginPlay() makes all inventory items spawn with it set.)
if (!(GetDefault()->flags & MF_DROPPED))
{
flags &= ~MF_DROPPED;
}
HandleSpawnFlags (); HandleSpawnFlags ();
} }