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 #3403 from acemod/fixCargoEventsParams

Browse Source 
Reimplement old parameter syntax for (Un)LoadCargo events
This commit is contained in:
jonpas 2016-02-25 16:01:57 +01:00
commit 8375694368
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/cargo/XEH_postInit.sqf
View File

@ -3,7 +3,7 @@
["AddCargoByClass", {_this call FUNC(addCargoItem)}] call EFUNC(common,addEventHandler); ["AddCargoByClass", {_this call FUNC(addCargoItem)}] call EFUNC(common,addEventHandler);
["LoadCargo", { ["LoadCargo", {
(_this select 0) params ["_item","_vehicle"]; params ["_item", "_vehicle"];
TRACE_2("LoadCargo EH",_item,_vehicle); TRACE_2("LoadCargo EH",_item,_vehicle);
private _loaded = [_item, _vehicle] call FUNC(loadItem); private _loaded = [_item, _vehicle] call FUNC(loadItem);
@ -22,7 +22,7 @@
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
["UnloadCargo", { ["UnloadCargo", {
(_this select 0) params ["_item","_vehicle", ["_unloader", objNull]]; params ["_item", "_vehicle", ["_unloader", objNull]];
TRACE_3("UnloadCargo EH",_item,_vehicle,_unloader); TRACE_3("UnloadCargo EH",_item,_vehicle,_unloader);
private _unloaded = [_item, _vehicle, _unloader] call FUNC(unloadItem); //returns true if sucessful private _unloaded = [_item, _vehicle, _unloader] call FUNC(unloadItem); //returns true if sucessful

8
addons/cargo/functions/fnc_startLoadIn.sqf
View File

@ -37,7 +37,13 @@ private _return = false;
if ([_object, _vehicle] call FUNC(canLoadItemIn)) then { if ([_object, _vehicle] call FUNC(canLoadItemIn)) then {
private _size = [_object] call FUNC(getSizeItem); private _size = [_object] call FUNC(getSizeItem);
[5 * _size, [_object,_vehicle], "LoadCargo", {}, localize LSTRING(LoadingItem)] call EFUNC(common,progressBar); [
5 * _size,
[_object,_vehicle],
{["LoadCargo", _this select 0] call EFUNC(common,localEvent)},
{},
localize LSTRING(LoadingItem)
] call EFUNC(common,progressBar);
_return = true; _return = true;
} else { } else {
private _displayName = getText (configFile >> "CfgVehicles" >> typeOf _object >> "displayName"); private _displayName = getText (configFile >> "CfgVehicles" >> typeOf _object >> "displayName");

10
addons/cargo/functions/fnc_startUnload.sqf
View File

@ -34,7 +34,15 @@ private _item = _loaded select _selected; //This can be an object or a classname
if ([_item, GVAR(interactionVehicle), ACE_player] call FUNC(canUnloadItem)) then { if ([_item, GVAR(interactionVehicle), ACE_player] call FUNC(canUnloadItem)) then {
private _size = [_item] call FUNC(getSizeItem); private _size = [_item] call FUNC(getSizeItem);
[5 * _size, [_item, GVAR(interactionVehicle), ACE_player], "UnloadCargo", {}, localize LSTRING(UnloadingItem), {true}, ["isNotSwimming"]] call EFUNC(common,progressBar); [
5 * _size,
[_item, GVAR(interactionVehicle), ACE_player],
{["UnloadCargo", _this select 0] call EFUNC(common,localEvent)},
{},
localize LSTRING(UnloadingItem),
{true},
["isNotSwimming"]
] call EFUNC(common,progressBar);
} else { } else {
private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item}; private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item};
private _displayName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName"); private _displayName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName");