From f738b17db7dd02b7775537c42ddf1061ce4ab81d Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Tue, 10 May 2016 22:32:40 +0200
Subject: [PATCH] show virtual load in inventory menu

---
 .../functions/fnc_addLoadToUnitContainer.sqf        |  1 +
 addons/movement/functions/fnc_getWeight.sqf         | 13 ++++++++++++-
 addons/movement/functions/fnc_handleVirtualMass.sqf |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/movement/functions/fnc_addLoadToUnitContainer.sqf b/addons/movement/functions/fnc_addLoadToUnitContainer.sqf
index 3928d1c822..a79b2ab917 100644
--- a/addons/movement/functions/fnc_addLoadToUnitContainer.sqf
+++ b/addons/movement/functions/fnc_addLoadToUnitContainer.sqf
@@ -17,6 +17,7 @@
 params [["_unit", objNull, [objNull]], ["_container", objNull, [objNull]], ["_virtualLoadToAdd", 0, [0]]];
 
 if !(_container in [
+    _unit,
     uniformContainer _unit,
     vestContainer _unit,
     backpackContainer _unit
diff --git a/addons/movement/functions/fnc_getWeight.sqf b/addons/movement/functions/fnc_getWeight.sqf
index 11dd8c4ee6..b64abc3623 100644
--- a/addons/movement/functions/fnc_getWeight.sqf
+++ b/addons/movement/functions/fnc_getWeight.sqf
@@ -17,7 +17,18 @@
 
 params ["_unit"];
 
-private _weight = loadAbs _unit * 0.1;
+private _virtualLoad = 0;
+
+{
+    _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]);
+} forEach [
+    _unit,
+    uniformContainer _unit,
+    vestContainer _unit,
+    backpackContainer _unit
+];
+
+private _weight = (loadAbs _unit + _virtualLoad) * 0.1;
 
 if (GVAR(useImperial)) then {
     _weight = format ["%1lb", (round (_weight * 100)) / 100];
diff --git a/addons/movement/functions/fnc_handleVirtualMass.sqf b/addons/movement/functions/fnc_handleVirtualMass.sqf
index 5d71c58df4..13a7b77f9a 100644
--- a/addons/movement/functions/fnc_handleVirtualMass.sqf
+++ b/addons/movement/functions/fnc_handleVirtualMass.sqf
@@ -20,6 +20,7 @@ private _virtualLoad = 0;
 {
     _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]);
 } forEach [
+    _unit,
     uniformContainer _unit,
     vestContainer _unit,
     backpackContainer _unit