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 pull request #2614 from jonpas/loadCargoOptionalHint

Browse Source 
Optionalized Cargo Loaded Hint
This commit is contained in:
commy2
2015-09-27 13:48:27 +02:00
parent f77242fce3 151903ace4
commit 3211e6432e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addons/cargo/functions/fnc_addCargoItem.sqf
View File

@ -6,6 +6,7 @@
* 0: Item Classname <STRING> * 0: Item Classname <STRING>
* 1: Vehicle <OBJECT> * 1: Vehicle <OBJECT>
* 2: Amount <NUMBER> (default: 1) * 2: Amount <NUMBER> (default: 1)
* 3: Show Hint <BOOL> (default: false)
* *
* Return Value: * Return Value:
* None * None
@ -18,7 +19,7 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_position", "_item", "_i"]; private ["_position", "_item", "_i"];
params ["_itemClass", "_vehicle", ["_amount", 1]]; params ["_itemClass", "_vehicle", ["_amount", 1], ["_showHint", false, [false]] ];
TRACE_3("params",_itemClass,_vehicle,_amount); TRACE_3("params",_itemClass,_vehicle,_amount);
_position = getPos _vehicle; _position = getPos _vehicle;
@ -29,12 +30,12 @@ for "_i" from 1 to _amount do {
_item = createVehicle [_itemClass, _position, [], 0, "CAN_COLLIDE"]; _item = createVehicle [_itemClass, _position, [], 0, "CAN_COLLIDE"];
// Load item or delete it if no space left // Load item or delete it if no space left
if !([_item, _vehicle] call FUNC(loadItem)) exitWith { if !([_item, _vehicle, _showHint] call FUNC(loadItem)) exitWith {
TRACE_1("no room to load item - deleting",_item); TRACE_1("no room to load item - deleting",_item);
deleteVehicle _item; deleteVehicle _item;
}; };
TRACE_1("Item Loaded",_item); TRACE_1("Item Loaded",_item);
// Invoke listenable event // Invoke listenable event
["cargoAddedByClass", [_itemClass, _vehicle, _amount]] call EFUNC(common,globalEvent); ["cargoAddedByClass", [_itemClass, _vehicle, _amount]] call EFUNC(common,globalEvent);
}; };

7
addons/cargo/functions/fnc_loadItem.sqf
View File

@ -5,6 +5,7 @@
* Arguments: * Arguments:
* 0: Object <OBJECT> * 0: Object <OBJECT>
* 1: Vehicle <OBJECT> * 1: Vehicle <OBJECT>
* 2: Show Hint <BOOL> (default: true)
* *
* Return value: * Return value:
* Object loaded <BOOL> * Object loaded <BOOL>
@ -18,7 +19,7 @@
private ["_loaded", "_space", "_itemSize"]; private ["_loaded", "_space", "_itemSize"];
params ["_item", "_vehicle"]; params ["_item", "_vehicle", ["_showHint", true, [true]] ];
TRACE_2("params",_item,_vehicle); TRACE_2("params",_item,_vehicle);
if !([_item, _vehicle] call FUNC(canLoadItemIn)) exitWith { if !([_item, _vehicle] call FUNC(canLoadItemIn)) exitWith {
@ -46,7 +47,9 @@ private ["_itemName", "_vehicleName"];
_itemName = getText (configFile >> "CfgVehicles" >> typeOf _item >> "displayName"); _itemName = getText (configFile >> "CfgVehicles" >> typeOf _item >> "displayName");
_vehicleName = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName"); _vehicleName = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName");
["displayTextStructured", [[localize LSTRING(LoadedItem), _itemName, _vehicleName], 3.0]] call EFUNC(common,localEvent); if (_showHint) then {
["displayTextStructured", [[localize LSTRING(LoadedItem), _itemName, _vehicleName], 3.0]] call EFUNC(common,localEvent);
};
// Invoke listenable event // Invoke listenable event
["cargoLoaded", [_item, _vehicle]] call EFUNC(common,globalEvent); ["cargoLoaded", [_item, _vehicle]] call EFUNC(common,globalEvent);