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

@ -185,27 +185,27 @@ END_DEFAULTS
void AThrustFloor::Activate (AActor *activator)
{
if (args[0] == 0)
{
S_Sound (this, CHAN_BODY, "ThrustSpikeLower", 1, ATTN_NORM);
renderflags &= ~RF_INVISIBLE;
if (args[1])
SetState (&States[S_BTHRUSTRAISE]);
else
SetState (&States[S_THRUSTRAISE]);
}
if (args[0] == 0)
{
S_Sound (this, CHAN_BODY, "ThrustSpikeLower", 1, ATTN_NORM);
renderflags &= ~RF_INVISIBLE;
if (args[1])
SetState (&States[S_BTHRUSTRAISE]);
else
SetState (&States[S_THRUSTRAISE]);
}
}
void AThrustFloor::Deactivate (AActor *activator)
{
if (args[0] == 1)
{
S_Sound (this, CHAN_BODY, "ThrustSpikeRaise", 1, ATTN_NORM);
if (args[1])
SetState (&States[S_BTHRUSTLOWER]);
else
SetState (&States[S_THRUSTLOWER]);
}
if (args[0] == 1)
{
S_Sound (this, CHAN_BODY, "ThrustSpikeRaise", 1, ATTN_NORM);
if (args[1])
SetState (&States[S_BTHRUSTLOWER]);
else
SetState (&States[S_THRUSTLOWER]);
}
}
// Spike up -----------------------------------------------------------------
@ -264,7 +264,7 @@ void A_ThrustInitDn (AActor *actor)
actor->flags2 = MF2_NOTELEPORT|MF2_FLOORCLIP;
actor->renderflags = RF_INVISIBLE;
static_cast<AThrustFloor *>(actor)->DirtClump =
Spawn<ADirtClump> (actor->x, actor->y, actor->z);
Spawn<ADirtClump> (actor->x, actor->y, actor->z, ALLOW_REPLACE);
}