- Changed: HIRESTEX 'define' textures now replace existing textures

of type MiscPatch with the same name.
- Added UDMF line trigger types MonsterUse and MonsterPush.
- Separated skill and class filter bits from FMapThing::flags so that
  UDMF can define up to 16 of each. Also separated easy/baby and
  hard/nightmare and changed default MAPINFO definitions.
- Changed: Crosshair drawing uses the current player class's default health instead
  of 100 to calculate the color for the crosshair.
- Added SECF_NOFALLINGDAMAGE flag plus Sector_ChangeFlags to set it. Also separated
  all user settable flags from MoreFlags into their own Flags variable.


SVN r964 (trunk)
This commit is contained in:
Christoph Oelckers 2008-05-11 21:16:32 +00:00
commit 6c21616c85
31 changed files with 1336 additions and 421 deletions

View file

@ -1026,7 +1026,7 @@ void DBaseStatusBar::DrawCrosshair ()
if (crosshairhealth)
{
int health = CPlayer->health;
int health = Scale(CPlayer->health, 100, CPlayer->mo->GetDefault()->health);
if (health >= 85)
{