zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Always clear bEvilGrin after checking it in FMugShot::UpdateState(). If

Browse source 
it's not an appropriate time to show the grin when the flag is set, it
  shouldn't be saved until later.
This commit is contained in:
Randy Heit 2013-07-02 14:48:03 -05:00
parent 5af1e6f734
commit e845b292c2
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_shared/sbar_mugshot.cpp
View file

@ -352,11 +352,8 @@ int FMugShot::UpdateState(player_t *player, StateFlags stateflags)
SetState("grin", false);
return 0;
}
else if (CurrentState == NULL)
{
bEvilGrin = false;
}
}
bEvilGrin = false;
bool ouch = (!st_oldouch && FaceHealth - player->health > ST_MUCHPAIN) || (st_oldouch && player->health - FaceHealth > ST_MUCHPAIN);
if (player->damagecount &&