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

Cargo - Fix loaded cargo not being deleted when vehicle is destroyed (#7851)

Browse Source
This commit is contained in:
mharis001 2020-08-18 13:42:09 -04:00 committed by GitHub
parent c8bb046d31
commit 4d769e4b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/cargo/CfgEventHandlers.hpp
View File

@ -16,11 +16,3 @@ class Extended_PostInit_EventHandlers {
init = QUOTE(call COMPILE_FILE(XEH_postInit)); init = QUOTE(call COMPILE_FILE(XEH_postInit));
}; };
}; };
class Extended_Killed_EventHandlers {
class All {
class ADDON {
serverKilled = QUOTE(call FUNC(handleDestroyed));
};
};
};

1
addons/cargo/XEH_PREP.hpp
View File

@ -4,6 +4,7 @@ PREP(canLoadItemIn);
PREP(canUnloadItem); PREP(canUnloadItem);
PREP(getCargoSpaceLeft); PREP(getCargoSpaceLeft);
PREP(getSizeItem); PREP(getSizeItem);
PREP(handleDeleted);
PREP(handleDestroyed); PREP(handleDestroyed);
PREP(initObject); PREP(initObject);
PREP(initVehicle); PREP(initVehicle);

6
addons/cargo/XEH_preInit.sqf
View File

@ -13,4 +13,10 @@ GVAR(initializedVehicleClasses) = [];
GVAR(cargoHolderTypes) = ["Car", "Air", "Tank", "Ship", "Cargo_base_F", "Land_PaperBox_closed_F"]; GVAR(cargoHolderTypes) = ["Car", "Air", "Tank", "Ship", "Cargo_base_F", "Land_PaperBox_closed_F"];
GVAR(disableParadropEffectsClasstypes) = ["Car_F"]; GVAR(disableParadropEffectsClasstypes) = ["Car_F"];
if (isServer) then {
["All", "Deleted", LINKFUNC(handleDeleted)] call CBA_fnc_addClassEventHandler;
};
["All", "Killed", LINKFUNC(handleDestroyed)] call CBA_fnc_addClassEventHandler;
ADDON = true; ADDON = true;

25
addons/cargo/functions/fnc_handleDeleted.sqf Normal file
View File

@ -0,0 +1,25 @@
#include "script_component.hpp"
/*
* Author: mharis001
* Handles an object being deleted by deleting all loaded cargo.
*
* Arguments:
* 0: Object <OBJECT>
*
* Return Value:
* None
*
* Example:
* [_object] call ace_cargo_fnc_handleDeleted
*
* Public: No
*/
params ["_object"];
{
if (_x isEqualType objNull) then {
detach _x;
deleteVehicle _x;
};
} forEach (_object getVariable [QGVAR(loaded), []]);

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

@ -1,7 +1,7 @@
#include "script_component.hpp" #include "script_component.hpp"
/* /*
* Author: Glowbal * Author: Glowbal
* Handle object being destroyed. Only runs on server. * Handle object being destroyed.
* *
* Arguments: * Arguments:
* 0: Object <OBJECT> * 0: Object <OBJECT>
@ -10,7 +10,7 @@
* None * None
* *
* Example: * Example:
* [object] call ace_cargo_fnc_handleDestroyed * [_object] call ace_cargo_fnc_handleDestroyed
* *
* Public: No * Public: No
*/ */
@ -24,9 +24,9 @@ if (_loaded isEqualTo []) exitWith {};
{ {
// TODO Do we want to be able to recover destroyed equipment? // TODO Do we want to be able to recover destroyed equipment?
if (_x isEqualType objNull) then { if (_x isEqualType objNull) then {
detach _x;
deleteVehicle _x; deleteVehicle _x;
}; };
nil } forEach _loaded;
} count _loaded;
[_vehicle] call FUNC(validateCargoSpace); [_vehicle] call FUNC(validateCargoSpace);