Smooth stance transition during throwing chargeup

Author: fourZK

Entities/AHuman.cpp

@@ -3413,16 +3413,15 @@ void AHuman::Update()
 						m_ThrowTmr.Reset();
 						if (!pThrown->ActivatesWhenReleased()) { pThrown->Activate(); }
 					}
+					float throwProgress = GetThrowProgress();
 					m_ArmsState = THROWING_PREP;
-					m_pFGArm->ReachToward(m_pFGArm->GetJointPos() + pThrown->GetStartThrowOffset().RadRotate(m_AimAngle + m_AngularVel * deltaTime).GetXFlipped(m_HFlipped));
+					m_pFGArm->ReachToward(m_pFGArm->GetJointPos() + (pThrown->GetStartThrowOffset().GetXFlipped(m_HFlipped) * throwProgress + pThrown->GetStanceOffset() * (1.0F - throwProgress)).RadRotate(adjustedAimAngle));
 				} else if (m_ArmsState == THROWING_PREP) {
 					m_ArmsState = THROWING_RELEASE;
 					// TODO: figure out how to properly use EndThrowOffset, since it doesn't play much a role for just one frame!
 					m_pFGArm->SetHandPos(m_pFGArm->GetJointPos() + pThrown->GetEndThrowOffset().RadRotate(adjustedAimAngle).GetXFlipped(m_HFlipped));
 
-					MovableObject *pMO = m_pFGArm->ReleaseHeldMO();
-
-					if (pMO) {
+					if (MovableObject *pMO = m_pFGArm->ReleaseHeldMO()) {
 						pMO->SetPos(m_pFGArm->GetJointPos() + Vector(m_pFGArm->GetMaxLength() * GetFlipFactor(), -m_pFGArm->GetMaxLength() * 0.5F).RadRotate(adjustedAimAngle));
 						float maxThrowVel = pThrown->GetMaxThrowVel();
 						float minThrowVel = pThrown->GetMinThrowVel();
@@ -3858,7 +3857,8 @@ void AHuman::Update()
 				HeldDevice *heldDevice = dynamic_cast<HeldDevice *>(GetEquippedItem());
 				ThrownDevice *thrownDevice = dynamic_cast<ThrownDevice *>(heldDevice);
 				if (thrownDevice && (m_ArmsState == THROWING_PREP || isSharpAiming)) {
-					m_pBGArm->ReachToward(m_pBGArm->GetJointPos() + thrownDevice->GetEndThrowOffset().RadRotate(m_AimAngle).GetXFlipped(m_HFlipped));
+					float throwProgress = isSharpAiming ? 1.0F : GetThrowProgress();
+					m_pBGArm->ReachToward(m_pBGArm->GetJointPos() + (thrownDevice->GetEndThrowOffset().GetXFlipped(m_HFlipped) * throwProgress + (thrownDevice->GetStanceOffset() + thrownDevice->GetSupportOffset().GetXFlipped(m_HFlipped)) * (1.0F - throwProgress)).RadRotate(adjustedAimAngle));
 				} else if (heldDevice) {
 					if (GetEquippedBGItem() && !heldDevice->IsOneHanded()) {
 						UnequipBGArm();