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

Fix #3363 lamp unloading bug, Correct cargo menu button classnames

Browse Source
This commit is contained in:
jonpas 2016-02-23 22:05:15 +01:00
parent 52108b1737
commit 168ec5344d
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/cargo/XEH_postInit.sqf
View File

@ -24,7 +24,7 @@
["UnloadCargo", { ["UnloadCargo", {
(_this select 0) params ["_item","_vehicle", ["_unloader", objNull]]; (_this select 0) 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
private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item}; private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item};
@ -43,3 +43,10 @@
// TOOO maybe drag/carry the unloaded item? // TOOO maybe drag/carry the unloaded item?
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
["ServerUnloadCargo", {
params ["_item", "_emptyPosAGL"];
_item hideObjectGlobal false;
_item setPosASL (AGLtoASL _emptyPosAGL);
}] call EFUNC(common,addEventHandler);

5
addons/cargo/functions/fnc_unloadItem.sqf
View File

@ -50,8 +50,9 @@ _vehicle setVariable [QGVAR(space), (_space + _itemSize), true];
if (_item isEqualType objNull) then { if (_item isEqualType objNull) then {
detach _item; detach _item;
_item setPosASL (AGLtoASL _emptyPosAGL); // hideObjectGlobal must be executed before setPos to ensure light objects are rendered correctly
["hideObjectGlobal", [_item, false]] call EFUNC(common,serverEvent); // do both on server to ensure they are executed in the correct order
["ServerUnloadCargo", [_item, _emptyPosAGL]] call EFUNC(common,serverEvent);
} else { } else {
private _newItem = createVehicle [_item, _emptyPosAGL, [], 0, ""]; private _newItem = createVehicle [_item, _emptyPosAGL, [], 0, ""];
_newItem setPosASL (AGLtoASL _emptyPosAGL); _newItem setPosASL (AGLtoASL _emptyPosAGL);

4
addons/cargo/menu.hpp
View File

@ -67,7 +67,7 @@ class GVAR(menu) {
colorSelectBackground[] = {0.3, 0.3, 0.3, 1.0}; colorSelectBackground[] = {0.3, 0.3, 0.3, 1.0};
colorSelectBackground2[] = {0.3, 0.3, 0.3, 1.0}; colorSelectBackground2[] = {0.3, 0.3, 0.3, 1.0};
}; };
class btnUnload: ACE_gui_buttonBase { class btnCancel: ACE_gui_buttonBase {
text = "Cancel"; text = "Cancel";
idc = 11; idc = 11;
x = "13.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)"; x = "13.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
@ -93,7 +93,7 @@ class GVAR(menu) {
periodOver = 1; periodOver = 1;
action = QUOTE(closeDialog 0); action = QUOTE(closeDialog 0);
}; };
class btnCancel: btnUnload { class btnUnload: btnCancel {
text = CSTRING(unloadObject); text = CSTRING(unloadObject);
idc = 12; idc = 12;
x = "20.9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)"; x = "20.9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";