diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 948c0de1c..50980515a 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ 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: Sorcerer2FX1's SpawnID was not restricted to Heretic. diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_shared/sbar_mugshot.cpp index e52d97c60..0b27c069c 100644 --- a/src/g_shared/sbar_mugshot.cpp +++ b/src/g_shared/sbar_mugshot.cpp @@ -376,7 +376,7 @@ int FMugShot::UpdateState(player_t *player, bool xdeath, bool animated_god_mode) } } 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; full_state_name = "ouch.";