- Fixed: The ouch face fix was lost when SBARINFO mugshot became the only

mugshot present.


SVN r1098 (trunk)
This commit is contained in:
Randy Heit 2008-07-31 18:51:15 +00:00
parent 21a7564c98
commit 35b40534fe
2 changed files with 3 additions and 1 deletions

View file

@ -1,4 +1,6 @@
July 31, 2008 July 31, 2008
- Fixed: The ouch face fix was lost when SBARINFO mugshot became the only
mugshot present.
- Fixed: Mace SpawnID was assigned to the MacePowered actor instead. - Fixed: Mace SpawnID was assigned to the MacePowered actor instead.
- Fixed: Sorcerer2FX1's SpawnID was not restricted to Heretic. - Fixed: Sorcerer2FX1's SpawnID was not restricted to Heretic.

View file

@ -376,7 +376,7 @@ int FMugShot::UpdateState(player_t *player, bool xdeath, bool animated_god_mode)
} }
} }
bool use_ouch = false; bool use_ouch = false;
if ((FaceHealth != -1 && player->health - FaceHealth > ST_MUCHPAIN) || bOuchActive) if ((FaceHealth != -1 && FaceHealth - player->health > ST_MUCHPAIN) || bOuchActive)
{ {
use_ouch = true; use_ouch = true;
full_state_name = "ouch."; full_state_name = "ouch.";