Little cleanup, tweaking and adjustment

Author: Causeless

CHANGELOG.md

@@ -84,7 +84,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `Actor` INI and Lua (R/W) property `PainThreshold`, which determines how much damage this actor must take in a frame to play their `PainSound`. This can be set to 0 to never manually play the sound. Defaults to 15.  
 
-- New `AHuman` INI and Lua (R/W) property `MaxWalkPathCrouchShift`, which determines how much the actor will automatically duck down to avoid low ceilings above them. This can be set to 0 to never duck. Defaults to 5.  
+- New `AHuman` INI and Lua (R/W) property `MaxWalkPathCrouchShift`, which determines how much the actor will automatically duck down to avoid low ceilings above them. This can be set to 0 to never duck. Defaults to 6.  
 
 - New `MOPixel` INI and Lua (R/W) property `Staininess`, which defines how likely a pixel is to stain a surface when it collides with it. Staining a surface changes that surface's `Color` to that of this `MOPixel`, without changing the underlying material. Value can be between 0 and 1. Defaults to 0 (never stain).  
 

Entities/AHuman.cpp

@@ -63,7 +63,7 @@ void AHuman::Clear()
     m_MoveState = STAND;
     m_ProneState = NOTPRONE;
     m_ProneTimer.Reset();
-	m_MaxWalkPathCrouchShift = 5.0F;
+	m_MaxWalkPathCrouchShift = 6.0F;
     for (int i = 0; i < MOVEMENTSTATECOUNT; ++i) {
         m_Paths[FGROUND][i].Reset();
         m_Paths[BGROUND][i].Reset();
@@ -1717,14 +1717,13 @@ void AHuman::UpdateWalkAngle(AHuman::Layer whichLayer) {
 
 		if (m_pHead) {
 			// Cast a ray above our head to either side to determine whether we need to crouch
-			float desiredCrouchHeadRoom = std::floor(m_pHead->GetRadius() + 2.0f);
+			float desiredCrouchHeadRoom = std::floor(m_pHead->GetRadius() + 1.5f);
 			float toSide = std::floor(m_pHead->GetRadius() + 3.0f);
 			Vector hitPosLeft = (m_pHead->GetPos() + Vector(-toSide, 0.0F)).Floor();
 			Vector hitPosRight = (m_pHead->GetPos() + Vector(toSide, 0.0F)).Floor();
-			bool leftHit = g_SceneMan.CastStrengthRay(hitPosLeft, Vector(0.0F, -desiredCrouchHeadRoom), 10.0F, hitPosLeft, 0, g_MaterialGrass);
-			bool rightHit = g_SceneMan.CastStrengthRay(hitPosRight, Vector(0.0F, -desiredCrouchHeadRoom), 10.0F, hitPosRight, 0, g_MaterialGrass);
-			float lowestY = std::max(hitPosLeft.m_Y, hitPosRight.m_Y);
-			float headroom = std::floor(m_pHead->GetPos().m_Y - lowestY);
+			g_SceneMan.CastStrengthRay(hitPosLeft, Vector(0.0F, -desiredCrouchHeadRoom), 10.0F, hitPosLeft, 0, g_MaterialGrass);
+			g_SceneMan.CastStrengthRay(hitPosRight, Vector(0.0F, -desiredCrouchHeadRoom), 10.0F, hitPosRight, 0, g_MaterialGrass);
+			float headroom = m_pHead->GetPos().m_Y - std::max(hitPosLeft.m_Y, hitPosRight.m_Y);
 			float adjust = desiredCrouchHeadRoom - headroom;
 			m_WalkPathYOffset = std::clamp(LERP(0.0F, 1.0F, m_WalkPathYOffset, adjust, 0.3F), 0.0F, m_MaxWalkPathCrouchShift);
 		} else {