Merge branch 'master' into master

AsYetUntitled · Jul 2, 2017 · 682de7d · 682de7d
2 parents 27a6e3b + b525f34
commit 682de7d
Show file tree

Hide file tree

Showing 4 changed files with 376 additions and 356 deletions.
diff --git a/Altis_Life.Altis/core/shops/fn_weaponShopBuySell.sqf b/Altis_Life.Altis/core/shops/fn_weaponShopBuySell.sqf
@@ -48,7 +48,7 @@ if ((uiNamespace getVariable ["Weapon_Shop_Filter",0]) isEqualTo 1) then {
             _funds = group player getVariable "gang_bank";
             _funds = _funds - _price;
             group player setVariable ["gang_bank",_funds,true];
-            [_item,true] spawn life_fnc_handleItem;
+            [_item,true] call life_fnc_handleItem;
 
             if (life_HC_isActive) then {
                 [1,group player] remoteExecCall ["HC_fnc_updateGang",HC_Life];
@@ -61,14 +61,14 @@ if ((uiNamespace getVariable ["Weapon_Shop_Filter",0]) isEqualTo 1) then {
             if (_price > CASH) exitWith {hint localize "STR_NOTF_NotEnoughMoney"};
             hint parseText format [localize "STR_Shop_Weapon_BoughtItem",_itemInfo select 1,[_price] call life_fnc_numberText];
             CASH = CASH - _price;
-            [_item,true] spawn life_fnc_handleItem;
+            [_item,true] call life_fnc_handleItem;
         };
     } else {
         if (_price > CASH) exitWith {hint localize "STR_NOTF_NotEnoughMoney"};
         hint parseText format [localize "STR_Shop_Weapon_BoughtItem",_itemInfo select 1,[_price] call life_fnc_numberText];
         CASH = CASH - _price;
-        [_item,true] spawn life_fnc_handleItem;
+        [_item,true] call life_fnc_handleItem;
     };
 };
 [0] call SOCK_fnc_updatePartial;
-[] call life_fnc_saveGear;
+[3] call SOCK_fnc_updatePartial;