Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into medical-adjustments

Browse Source
This commit is contained in:
Glowbal 2015-08-26 09:10:45 +02:00
commit 3acfc4d2a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/dragging/functions/fnc_getWeight.sqf
View File

@ -24,7 +24,7 @@ _totalWeight = 0;
// Cycle through all item types with their assigned config paths. // Cycle through all item types with their assigned config paths.
{ {
_x params["_items","_getConfigCode"]; _x params["_items","_getConfigCode"];
_items params ["_item", "_count"] _items params ["_item", "_count"];
// Cycle through all items and read their mass out of the config. // Cycle through all items and read their mass out of the config.
{ {
// Multiply mass with amount of items and add the mass to the total weight. // Multiply mass with amount of items and add the mass to the total weight.

2
addons/dragging/functions/fnc_initObject.sqf
View File

@ -26,7 +26,7 @@ if (getNumber (_config >> QGVAR(canDrag)) == 1) then {
[_object, true, _position, _direction] call FUNC(setDraggable); [_object, true, _position, _direction] call FUNC(setDraggable);
}; };
if (getNumber (_config >> QGVAR(canCarry)) == 1) then if (getNumber (_config >> QGVAR(canCarry)) == 1) then {
_position = getArray (_config >> QGVAR(carryPosition)); _position = getArray (_config >> QGVAR(carryPosition));
_direction = getNumber (_config >> QGVAR(carryDirection)); _direction = getNumber (_config >> QGVAR(carryDirection));