Move BG item into FG hand when dropping an item.

Author: fourZK

Entities/AHuman.cpp

@@ -3451,27 +3451,31 @@ void AHuman::Update()
     // Item dropping logic
 
 	if (m_Controller.IsState(WEAPON_DROP) && m_Status != INACTIVE) {
-		bool anyDropped = false;
+		Arm *dropperArm = nullptr;
 		for (Arm *arm : { m_pFGArm, m_pBGArm }) {
-			if (!anyDropped && arm && arm->GetHeldDevice()) {
+			if (arm && arm->GetHeldDevice()) {
 				HeldDevice *heldDevice = arm->GetHeldDevice();
 				arm->RemoveAttachable(heldDevice, true, false);
+				if (dropperArm) {
+					if (heldDevice) {
+						dropperArm->SetHeldDevice(heldDevice);
+						arm->SetHandPos(dropperArm->GetPos());
+					}
+				} else {
+					heldDevice->SetPos(arm->GetJointPos() + Vector(arm->GetMaxLength() * GetFlipFactor(), 0).RadRotate(adjustedAimAngle));
+					Vector tossVec(1.0F + std::sqrt(std::abs(arm->GetThrowStrength()) / std::sqrt(std::abs(heldDevice->GetMass()) + 1.0F)), RandomNormalNum());
+					heldDevice->SetVel(heldDevice->GetVel() * 0.5F + tossVec.RadRotate(m_AimAngle).GetXFlipped(m_HFlipped));
+					heldDevice->SetAngularVel(heldDevice->GetAngularVel() + m_AngularVel * 0.5F + 3.0F * RandomNormalNum());
 
-				heldDevice->SetPos(arm->GetJointPos() + Vector(arm->GetMaxLength() * GetFlipFactor(), 0).RadRotate(adjustedAimAngle));
-				Vector tossVec(1.0F + std::sqrt(std::abs(arm->GetThrowStrength()) / std::sqrt(std::abs(heldDevice->GetMass()) + 1.0F)), RandomNormalNum());
-				heldDevice->SetVel(heldDevice->GetVel() * 0.5F + tossVec.RadRotate(m_AimAngle).GetXFlipped(m_HFlipped));
-				heldDevice->SetAngularVel(heldDevice->GetAngularVel() + m_AngularVel * 0.5F + 3.0F * RandomNormalNum());
-
-				arm->SetHandPos(heldDevice->GetPos());
-				if (!m_Inventory.empty()) {
-					arm->SetHeldDevice(dynamic_cast<HeldDevice *>(SwapNextInventory()));
-					arm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));
+					arm->SetHandPos(heldDevice->GetPos());
 				}
-				anyDropped = true;
-				break;
+				dropperArm = arm;
+			} else if (dropperArm && !m_Inventory.empty()) {
+				dropperArm->SetHeldDevice(dynamic_cast<HeldDevice*>(SwapNextInventory()));
+				dropperArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));
 			}
 		}
-		if (!anyDropped && !m_Inventory.empty() && !m_pFGArm) {
+		if (!dropperArm && !m_Inventory.empty() && !m_pFGArm) {
 			DropAllInventory();
 			if (m_pBGArm) {
 				m_pBGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));