Merge pull request #505 from cortex-command-community/4zk-content-source

Source fixes for pre-release 5.1

Author: garethyr

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; 
+		}
     }
 
 	////////////////////////////////////
@@ -3303,6 +3306,8 @@ void AHuman::Update()
 							if (deviceAsFirearm->FiredOnce()) {
 								m_CanActivateBGItem = true;
 								m_TriggerPulled = true;
+							} else {
+								m_CanActivateBGItem = !deviceAsFirearm->CanFire();
 							}
 						}
 					}
@@ -3399,6 +3404,8 @@ void AHuman::Update()
 					if (deviceAsFirearm->FiredOnce()) {
 						m_CanActivateBGItem = false;
 						m_TriggerPulled = true;
+					} else {
+						m_CanActivateBGItem = deviceAsFirearm->CanFire();
 					}
 				}
 			} else {
@@ -3448,27 +3455,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));

Entities/Actor.cpp

@@ -1540,7 +1540,7 @@ void Actor::Update()
     ////////////////////////////////
     // Death logic
 
-	if (m_Status != DYING && m_Status != DEAD && std::round(m_Health) <= 0) {
+	if (m_Status != DYING && m_Status != DEAD && m_Health <= 0) {
 		if (m_DeathSound) { m_DeathSound->Play(m_Pos); }
 		m_Controller.SetDisabled(true);
         DropAllInventory();
@@ -1803,7 +1803,7 @@ void Actor::DrawHUD(BITMAP *pTargetBitmap, const Vector &targetPos, int whichScr
                 pSymbolFont->DrawAligned(&bitmapInt, drawPos.m_X - 11, drawPos.m_Y + m_HUDStack, str, GUIFont::Left);
             }
 */
-            std::snprintf(str, sizeof(str), "%.0f", m_Health);
+			std::snprintf(str, sizeof(str), "%.0f", std::ceil(m_Health));
             pSymbolFont->DrawAligned(&bitmapInt, drawPos.m_X - 0, drawPos.m_Y + m_HUDStack, str, GUIFont::Left);
 
             m_HUDStack += -12;

Entities/HDFirearm.cpp

@@ -1172,14 +1172,12 @@ void HDFirearm::DrawHUD(BITMAP *pTargetBitmap, const Vector &targetPos, int whic
 	}
 
 	float sharpLength = std::max(m_MaxSharpLength * m_SharpAim, 20.0F);
-	int glowStrength;
+	int glowStrength = RandomNum(95, 159);
 	int pointCount;
 	if (playerControlled && sharpLength > 20.0F) {
 		pointCount = m_SharpAim > 0.5F ? 4 : 3;
-		glowStrength = RandomNum(127, 255);
 	} else {
 		pointCount = 2;
-		glowStrength = RandomNum(63, 127);
 	}
 	int pointSpacing = 10 - pointCount;
 	sharpLength -= static_cast<float>(pointSpacing * pointCount) * 0.5F;

Entities/HDFirearm.h

@@ -821,7 +821,7 @@ AddScriptFunctionNames(HeldDevice, "OnFire", "OnReload");
 	/// Gets whether this HDFirearm is ready to be fired.
 	/// </summary>
 	/// <returns>Whether this HDFirearm is ready to pop another Round.</returns>
-	bool CanFire() const { return m_ActivationTimer.IsPastSimMS(GetMSPerRound()); }
+	bool CanFire() const { return m_LastFireTmr.IsPastSimMS(GetMSPerRound()); }
 
 	/// <summary>
 	/// Gets whether this HDFirearm is halfway to be fired. Used for evenly spacing out dual-wielded fire.