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

@ -247,7 +247,7 @@ void A_SpotLightning (AActor *self)
if (self->target == NULL)
return;
spot = Spawn<ASpectralLightningSpot> (self->target->x, self->target->y, ONFLOORZ);
spot = Spawn<ASpectralLightningSpot> (self->target->x, self->target->y, ONFLOORZ, ALLOW_REPLACE);
if (spot != NULL)
{
spot->threshold = 25;
@ -265,7 +265,7 @@ void A_SpotLightning (AActor *self)
void A_SpawnProgrammerBase (AActor *self)
{
AActor *foo = Spawn<AProgrammerBase> (self->x, self->y, self->z + 24*FRACUNIT);
AActor *foo = Spawn<AProgrammerBase> (self->x, self->y, self->z + 24*FRACUNIT, ALLOW_REPLACE);
if (foo != NULL)
{
foo->angle = self->angle + ANGLE_180 + (pr_prog.Random2() << 22);