Merge branch 'development' into digital-axis-fix

MaximDude · web-flow · commit 293e78630486 · 2023-05-26T03:55:37.000+03:00
diff --git a/Entities/AHuman.cpp b/Entities/AHuman.cpp
@@ -3417,7 +3417,7 @@ void AHuman::Update()
 		}
 		EquipShieldInBGArm();
 		m_ArmsState = WEAPON_READY;
-	} else if (m_ArmsState == THROWING_RELEASE) {
+	} else if (m_ArmsState == THROWING_RELEASE && m_pFGArm) {
 		m_pFGArm->AddHandTarget("Adjusted Aim Angle", m_Pos + Vector(m_pFGArm->GetMaxLength() * GetFlipFactor(), -m_pFGArm->GetMaxLength() * 0.5F).RadRotate(adjustedAimAngle));
 	} else {
 		m_CanActivateBGItem = true;

Original file line number	Diff line number	Diff line change
`@@ -3417,7 +3417,7 @@ void AHuman::Update()`
`3417`	`3417`	`}`
`3418`	`3418`	`EquipShieldInBGArm();`
`3419`	`3419`	`m_ArmsState = WEAPON_READY;`
`3420`		`- } else if (m_ArmsState == THROWING_RELEASE) {`
	`3420`	`+ } else if (m_ArmsState == THROWING_RELEASE && m_pFGArm) {`
`3421`	`3421`	`m_pFGArm->AddHandTarget("Adjusted Aim Angle", m_Pos + Vector(m_pFGArm->GetMaxLength() * GetFlipFactor(), -m_pFGArm->GetMaxLength() * 0.5F).RadRotate(adjustedAimAngle));`
`3422`	`3422`	`} else {`
`3423`	`3423`	`m_CanActivateBGItem = true;`