zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- SBARINFO update: 

* Fixed: disabling lowerHealthCap didn't affect interpolateHealth.

SVN r1295 (trunk)
This commit is contained in:
Randy Heit 2008-11-27 17:47:37 +00:00
parent 6e83d231fe
commit ed6168ea92
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/rh-log.txt
View File

@ -1,4 +1,5 @@
November 27, 2008 November 27, 2008
- Fixed: disabling lowerHealthCap didn't affect interpolateHealth.
- The co-op summary screen now has a totals row at the bottom (if it fits). - The co-op summary screen now has a totals row at the bottom (if it fits).
- Changed WI_drawPercent() when wi_percents is false so that the total - Changed WI_drawPercent() when wi_percents is false so that the total
display is optional, and it formats it like Heretic's intermission, with display is optional, and it formats it like Heretic's intermission, with

7
src/g_shared/sbarinfo_display.cpp
View File

@ -296,13 +296,14 @@ void DSBarInfo::Tick ()
} }
else else
{ {
if(oldHealth > CPlayer->health) int health = SBarInfoScript->lowerHealthCap ? CPlayer->health : CPlayer->mo->health;
if(oldHealth > health)
{ {
oldHealth -= clamp((oldHealth - CPlayer->health) >> 2, 1, SBarInfoScript->interpolationSpeed); oldHealth -= clamp((oldHealth - health), 1, SBarInfoScript->interpolationSpeed);
} }
else if(oldHealth < CPlayer->health) else if(oldHealth < CPlayer->health)
{ {
oldHealth += clamp((CPlayer->health - oldHealth) >> 2, 1, SBarInfoScript->interpolationSpeed); oldHealth += clamp((health - oldHealth), 1, SBarInfoScript->interpolationSpeed);
} }
} }
AInventory *armor = CPlayer->mo->FindInventory<ABasicArmor>(); AInventory *armor = CPlayer->mo->FindInventory<ABasicArmor>();