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

More Privates

Browse Source
This commit is contained in:
PabstMirror
2015-04-17 22:40:37 -05:00
parent ed2e847247
commit caef5c105f
24 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/reload/functions/fnc_canCheckAmmo.sqf
View File

@ -13,6 +13,8 @@
EXPLODE_2_PVT(_this,_player,_target);
private ["_magazineType", "_magazineCfg"];
// Return true for static weapons if they have been fired once, @todo 1.40 this work-around doesn't work anymore
if (_target isKindOf "StaticWeapon") exitWith {
if (currentMagazine _target != "") exitWith {true};

2
addons/reload/functions/fnc_displayAmmo.sqf
View File

@ -14,7 +14,7 @@
EXPLODE_1_PVT(_this,_target);
private ["_weapon","_muzzle","_magazine","_showNumber","_ammo","_maxRounds","_count","_text","_color","_picture"];
private ["_weapon","_muzzle","_magazine","_showNumber","_ammo","_maxRounds","_count","_text","_color","_picture", "_a", "_string"];
_weapon = currentWeapon _target;
_muzzle = currentMuzzle _target;

4
addons/reload/functions/fnc_startLinkingBelt.sqf
View File

@ -15,7 +15,7 @@ EXPLODE_2_PVT(_this,_player,_target);
if (vehicle _target != _target) exitWith {false};
private ["_magazineCfg","_magazineType"];
private ["_magazineCfg","_magazineType", "_condition", "_onFailure", "_onFinish"];
_magazineType = currentMagazine _target;
_magazineCfg = configFile >> "CfgMagazines" >> _magazineType;
if (getNumber (_magazineCfg >> "ACE_isBelt") == 0) exitWith {false};
@ -54,7 +54,7 @@ _onFinish = {
_onFailure = {
EXPLODE_3_PVT((_this select 0),_player,_target,_magazine);
[_caller, "AmovPknlMstpSrasWrflDnon", 1] call EFUNC(common,doAnimation);
[_player, "AmovPknlMstpSrasWrflDnon", 1] call EFUNC(common,doAnimation);
// Add back the magazine with the former ammo count
_player addMagazine _magazine;