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

- Fixed: Picking up a weapon would sometimes not activate the grin. 

SVN r1043 (trunk)
This commit is contained in:
Christoph Oelckers 2008-06-16 23:43:31 +00:00
parent a86774fcdd
commit b899fbeabe
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/rh-log.txt
View File

@ -1,4 +1,6 @@
June 16, 2008 (Changes by Graf Zahl) June 16, 2008 (Changes by Graf Zahl)
- Fixed: The mugshot would not reset on re-spawn.
- Fixed: Picking up a weapon would sometimes not activate the grin.
- Changed: Line_SetIdentification will ignore extended parameters when - Changed: Line_SetIdentification will ignore extended parameters when
used in maps defined Hexen style in MAPINFO. used in maps defined Hexen style in MAPINFO.
- Fixed: Ambient sounds didn't pass their point of origin to S_StartSound. - Fixed: Ambient sounds didn't pass their point of origin to S_StartSound.

10
src/g_shared/sbar_mugshot.cpp
View File

@ -333,15 +333,15 @@ int FMugShot::UpdateState(player_t *player, bool xdeath, bool animated_god_mode)
{ {
if (bEvilGrin) if (bEvilGrin)
{ {
if (CurrentState == NULL) if (player->bonuscount)
{
bEvilGrin = false;
}
else if (player->bonuscount)
{ {
SetState("grin", false); SetState("grin", false);
return 0; return 0;
} }
else if (CurrentState == NULL)
{
bEvilGrin = false;
}
} }
if (player->damagecount) if (player->damagecount)