SVN r258 (trunk)

This commit is contained in:
Christoph Oelckers 2006-07-16 09:10:45 +00:00
commit ecce60e8f9
90 changed files with 326 additions and 309 deletions

View file

@ -184,7 +184,7 @@ void A_BrainPain (AActor *self)
static void BrainishExplosion (fixed_t x, fixed_t y, fixed_t z)
{
AActor *boom = Spawn<ARocket> (x, y, z);
AActor *boom = Spawn<ARocket> (x, y, z, NO_REPLACE);
if (boom != NULL)
{
boom->momz = pr_brainscream() << 9;
@ -281,7 +281,7 @@ void A_SpawnFly (AActor *self)
targ = self->target;
// First spawn teleport fire.
fog = Spawn<ASpawnFire> (targ->x, targ->y, targ->z);
fog = Spawn<ASpawnFire> (targ->x, targ->y, targ->z, ALLOW_REPLACE);
S_Sound (fog, CHAN_BODY, "brain/spawn", 1, ATTN_NORM);
// Randomly select monster to spawn.
@ -301,7 +301,7 @@ void A_SpawnFly (AActor *self)
else if (r < 246) type = "HellKnight";
else type = "BaronOfHell";
newmobj = Spawn (type, targ->x, targ->y, targ->z);
newmobj = Spawn (type, targ->x, targ->y, targ->z, ALLOW_REPLACE);
if (newmobj != NULL)
{
// Make the new monster hate what the boss eye hates