Re-equip BG item when exiting prone.

fourZK · fourZK · commit 0abe37f5a9a6 · 2023-06-22T14:56:21.000+03:00
Move unequipped BG item into front of inventory so that the actor will consistently re-equip the same item.
diff --git a/Entities/AHuman.cpp b/Entities/AHuman.cpp
@@ -1298,7 +1298,7 @@ bool AHuman::UnequipBGArm() {
 	if (m_pBGArm) {
 		if (HeldDevice *heldDevice = m_pBGArm->GetHeldDevice()) {
 			heldDevice->Deactivate();
-			AddToInventoryBack(m_pBGArm->RemoveAttachable(heldDevice));
+			AddToInventoryFront(m_pBGArm->RemoveAttachable(heldDevice));
 			m_pBGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));
 			return true;
 		}
@@ -3151,7 +3151,10 @@ void AHuman::Update()
             }
         }
         // Disengage the prone state as soon as crouch is released.
-        if (!crouching) { m_ProneState = NOTPRONE; }
+        if (!crouching && m_ProneState != NOTPRONE) { 
+			EquipShieldInBGArm();
+			m_ProneState = NOTPRONE; 
+		}
     }
 
 	////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -1298,7 +1298,7 @@ bool AHuman::UnequipBGArm() {`
`1298`	`1298`	`if (m_pBGArm) {`
`1299`	`1299`	`if (HeldDevice *heldDevice = m_pBGArm->GetHeldDevice()) {`
`1300`	`1300`	`heldDevice->Deactivate();`
`1301`		`- AddToInventoryBack(m_pBGArm->RemoveAttachable(heldDevice));`
	`1301`	`+ AddToInventoryFront(m_pBGArm->RemoveAttachable(heldDevice));`
`1302`	`1302`	`m_pBGArm->SetHandPos(m_Pos + RotateOffset(m_HolsterOffset));`
`1303`	`1303`	`return true;`
`1304`	`1304`	`}`
`@@ -3151,7 +3151,10 @@ void AHuman::Update()`
`3151`	`3151`	`}`
`3152`	`3152`	`}`
`3153`	`3153`	`// Disengage the prone state as soon as crouch is released.`
`3154`		`- if (!crouching) { m_ProneState = NOTPRONE; }`
	`3154`	`+ if (!crouching && m_ProneState != NOTPRONE) {`
	`3155`	`+ EquipShieldInBGArm();`
	`3156`	`+ m_ProneState = NOTPRONE;`
	`3157`	`+ }`
`3155`	`3158`	`}`
`3156`	`3159`
`3157`	`3160`	`////////////////////////////////////`