OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: A_Print and related functions should not make a use state chain succeed.

Browse source 
- fixed: APowerIronFeet must continuously reset the player's air supply.


SVN r2370 (trunk)
This commit is contained in:
Christoph Oelckers 2010-06-13 10:38:38 +00:00
commit e2ce20a445
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/g_shared/a_artifacts.cpp
View file

@ -750,10 +750,6 @@ void APowerIronFeet::AbsorbDamage (int damage, FName damageType, int &newdamage)
if (damageType == NAME_Drowning)
{
newdamage = 0;
if (Owner->player != NULL)
{
Owner->player->mo->ResetAirSupply ();
}
}
else if (Inventory != NULL)
{
@ -761,6 +757,21 @@ void APowerIronFeet::AbsorbDamage (int damage, FName damageType, int &newdamage)
}
}
//===========================================================================
//
// APowerIronFeet :: DoEffect
//
//===========================================================================
void APowerIronFeet::DoEffect ()
{
if (Owner->player != NULL)
{
Owner->player->mo->ResetAirSupply ();
}
}
// Strife Environment Suit Powerup -------------------------------------------
IMPLEMENT_CLASS (APowerMask)