- Added Line_SetTextureOffset special.
- Added 'allowprotection' keyword to terrain definitions to allow damaging flats that don't damage players with a radiation suit. - Fixed: SNDINFO rolloff setting for Strife was missing. SVN r839 (trunk)
This commit is contained in:
parent
eef724b58e
commit
e0bfe5fd42
8 changed files with 87 additions and 6 deletions
|
|
@ -568,8 +568,22 @@ void P_PlayerOnSpecialFlat (player_t *player, int floorType)
|
|||
if (Terrains[floorType].DamageAmount &&
|
||||
!(level.time & Terrains[floorType].DamageTimeMask))
|
||||
{
|
||||
P_DamageMobj (player->mo, NULL, NULL, Terrains[floorType].DamageAmount,
|
||||
Terrains[floorType].DamageMOD);
|
||||
AInventory *ironfeet = NULL;
|
||||
|
||||
if (Terrains[floorType].AllowProtection)
|
||||
{
|
||||
for (ironfeet = player->mo->Inventory; ironfeet != NULL; ironfeet = ironfeet->Inventory)
|
||||
{
|
||||
if (ironfeet->IsKindOf (RUNTIME_CLASS(APowerIronFeet)))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (ironfeet == NULL)
|
||||
{
|
||||
P_DamageMobj (player->mo, NULL, NULL, Terrains[floorType].DamageAmount,
|
||||
Terrains[floorType].DamageMOD);
|
||||
}
|
||||
if (Terrains[floorType].Splash != -1)
|
||||
{
|
||||
S_SoundID (player->mo, CHAN_AUTO,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue