From 8068fca60133634e4fa67004cd86f7c91039ec07 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sun, 31 Jan 2016 22:36:37 +0100
Subject: [PATCH] - fixed: player_t::Uncrouch should only reset the view height
 if the player is actually crouched.

---
 src/d_player.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index d6b039896..5ada741dc 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -487,12 +487,15 @@ public:
 
 	void Uncrouch()
 	{
-		crouchfactor = FRACUNIT;
-		crouchoffset = 0;
-		crouchdir = 0;
-		crouching = 0;
-		crouchviewdelta = 0;
-		viewheight = mo->ViewHeight;
+		if (crouchfactor != FRACUNIT)
+		{
+			crouchfactor = FRACUNIT;
+			crouchoffset = 0;
+			crouchdir = 0;
+			crouching = 0;
+			crouchviewdelta = 0;
+			viewheight = mo->ViewHeight;
+		}
 	}
 	
 	bool CanCrouch() const