mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-12-03 01:13:22 +00:00
- Fixed: The mugshot drawe ignored the accuracy parameter.
- Fixed: The Alt HUD's weapon drawer didn't check properly for invalid icons. SVN r1102 (trunk)
This commit is contained in:
parent
fddf69e950
commit
76a0086744
3 changed files with 4 additions and 2 deletions
|
@ -1,4 +1,6 @@
|
||||||
August 2, 2008 (Changes by Graf Zahl)
|
August 2, 2008 (Changes by Graf Zahl)
|
||||||
|
- Fixed: The mugshot drawe ignored the accuracy parameter.
|
||||||
|
- Fixed: The Alt HUD's weapon drawer didn't check properly for invalid icons.
|
||||||
- Added DECORATE conversions for Hexen's Cleric Mace, Firedemon and fog by
|
- Added DECORATE conversions for Hexen's Cleric Mace, Firedemon and fog by
|
||||||
Karate Chris.
|
Karate Chris.
|
||||||
|
|
||||||
|
|
|
@ -473,7 +473,7 @@ FTexture *FMugShot::GetFace(player_t *player, const char *default_face, int accu
|
||||||
{
|
{
|
||||||
int angle = UpdateState(player, xdeath, animated_god_mode);
|
int angle = UpdateState(player, xdeath, animated_god_mode);
|
||||||
int level = 0;
|
int level = 0;
|
||||||
while (player->health < (4-level) * (player->mo->GetMaxHealth()/5))
|
while (player->health < (accuracy-1-level) * (player->mo->GetMaxHealth()/accuracy))
|
||||||
{
|
{
|
||||||
level++;
|
level++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -588,7 +588,7 @@ static void DrawOneWeapon(player_t * CPlayer, int x, int & y, AWeapon * weapon)
|
||||||
FState * state=NULL, *ReadyState;
|
FState * state=NULL, *ReadyState;
|
||||||
|
|
||||||
FTextureID AltIcon = GetHUDIcon(weapon->GetClass());
|
FTextureID AltIcon = GetHUDIcon(weapon->GetClass());
|
||||||
picnum = AltIcon.isValid()? AltIcon : weapon->Icon;
|
picnum = !AltIcon.isNull()? AltIcon : weapon->Icon;
|
||||||
|
|
||||||
if (picnum.isNull())
|
if (picnum.isNull())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue