From b899fbeabe5c8d37a26240f1bbe206f7902f07cd Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Mon, 16 Jun 2008 23:43:31 +0000
Subject: [PATCH] - Fixed: Picking up a weapon would sometimes not activate the
 grin.

SVN r1043 (trunk)
---
 docs/rh-log.txt               |  2 ++
 src/g_shared/sbar_mugshot.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 9b74dd53b5..53e82bea6b 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 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
   used in maps defined Hexen style in MAPINFO.
 - Fixed: Ambient sounds didn't pass their point of origin to S_StartSound.
diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_shared/sbar_mugshot.cpp
index e330eca559..e52d97c60f 100644
--- a/src/g_shared/sbar_mugshot.cpp
+++ b/src/g_shared/sbar_mugshot.cpp
@@ -333,15 +333,15 @@ int FMugShot::UpdateState(player_t *player, bool xdeath, bool animated_god_mode)
 	{
 		if (bEvilGrin)
 		{
-			if (CurrentState == NULL)
-			{
-				bEvilGrin = false;
-			}
-			else if (player->bonuscount)
+			if (player->bonuscount)
 			{
 				SetState("grin", false);
 				return 0;
 			}
+			else if (CurrentState == NULL)
+			{
+				bEvilGrin = false;
+			}
 		}
 
 		if (player->damagecount)