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

needs testing

Browse Source
This commit is contained in:
PabstMirror 2015-01-13 16:53:48 -06:00
parent 1648def53f
commit 78d9ce6d7d
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/disposable/CfgEventHandlers.hpp
View File

@ -14,7 +14,7 @@ class Extended_FiredBIS_EventHandlers {
class CAManBase {
class ADDON {
// firedBIS = "if (local (_this select 0)) then {_this call AGM_Disposable_fnc_replaceATWeapon};";
firedBIS = QUOTE( _this call FUNC(replaceATWeapon); );
firedBIS = QUOTE( _this call FUNC(replaceATWeapon) );
};
};
};
@ -23,7 +23,8 @@ class Extended_FiredBIS_EventHandlers {
class Extended_Init_EventHandlers {
class CAManBase {
class ADDON {
init = "if (local (_this select 0)) then {_this spawn {[_this select 0, secondaryWeapon (_this select 0)] call AGM_Disposable_fnc_takeLoadedATWeapon}};";
// init = "if (local (_this select 0)) then {_this spawn {[_this select 0, secondaryWeapon (_this select 0)] call AGM_Disposable_fnc_takeLoadedATWeapon}};";
init = QUOTE( _this call FUNC(takeLoadedATWeapon) );
};
};
};
@ -31,7 +32,8 @@ class Extended_Init_EventHandlers {
class Extended_Take_EventHandlers {
class CAManBase {
class ADDON {
take = "if (local (_this select 0)) then {[_this select 0, _this select 2] call AGM_Disposable_fnc_takeLoadedATWeapon; [_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
// take = "if (local (_this select 0)) then {[_this select 0, _this select 2] call AGM_Disposable_fnc_takeLoadedATWeapon; [_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
take = QUOTE( _this call FUNC(takeLoadedATWeapon); _this call FUNC(updateInventoryDisplay); );
};
};
};
@ -39,7 +41,8 @@ class Extended_Take_EventHandlers {
class Extended_Put_EventHandlers {
class CAManBase {
class ADDON {
put = "if (local (_this select 0)) then {[_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
// put = "if (local (_this select 0)) then {[_this select 0, findDisplay 602] call AGM_Disposable_fnc_updateInventoryDisplay};";
take = QUOTE( _this call FUNC(updateInventoryDisplay); );
};
};
};

2
addons/disposable/CfgMagazines.hpp
View File

@ -4,7 +4,7 @@ class CfgMagazines {
author = "$STR_ACE_Common_ACETeam";
scope = 1;
displayName = "$STR_ACE_Disposable_PreloadedMissileDummy";
picture = "\AGM_Core\UI\blank_CO.paa";
picture = PATHTOEF(common,UI\blank_CO.paa);
weaponPoolAvailable = 0;
mass = 0;
};

2
addons/disposable/config.cpp
View File

@ -8,7 +8,7 @@ class CfgPatches {
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2/";
VERSION_CONFIG
// VERSION_CONFIG @todo
};
};

0
addons/disposable/functions/fn_replaceATWeapon.sqf → addons/disposable/functions/fnc_replaceATWeapon.sqf
View File

6
addons/disposable/functions/fn_takeLoadedATWeapon.sqf → addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
View File

@ -15,7 +15,11 @@
private ["_unit", "_launcher", "_config"];
_unit = _this select 0;
_launcher = _this select 1;
_launcher = secondaryWeapon _unit;
systemChat format ["Take %1 - %2", _unit, _launcher];
if (!local _unit) exitWith {};
_config = configFile >> "CfgWeapons" >> _launcher;

6
addons/disposable/functions/fn_updateInventoryDisplay.sqf → addons/disposable/functions/fnc_updateInventoryDisplay.sqf
View File

@ -15,14 +15,14 @@
private ["_player", "_display"];
_player = _this select 0;
if (!local _player) exitWith {};
_player removeMagazines "ACE_PreloadedMissileDummy";
_player removeMagazines "ACE_FiredMissileDummy";
disableSerialization;
_display = _this select 1;
if (isNull _display) exitWith {};
_display = findDisplay 602;
if (isNull _display) exitWith {systemChat "null";};
private ["_launcher", "_control", "_config"];