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 undefined variable and config entries (#9965)

Browse Source 
Cargo fixes
This commit is contained in:
johnb432 2024-04-23 23:07:16 +02:00 committed by GitHub
parent a0e4f09555
commit 9e6f624a68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/cargo/CfgVehicles.hpp
View File

@ -510,7 +510,7 @@ class CfgVehicles {
}; };
GVAR(space) = 2; GVAR(space) = 2;
GVAR(hasCargo) = 2; GVAR(hasCargo) = 1;
GVAR(size) = 3; GVAR(size) = 3;
GVAR(canLoad) = 1; GVAR(canLoad) = 1;
@ -524,7 +524,7 @@ class CfgVehicles {
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {}; class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
}; };
GVAR(space) = 3; GVAR(space) = 3;
GVAR(hasCargo) = 3; GVAR(hasCargo) = 1;
GVAR(size) = 3; GVAR(size) = 3;
GVAR(canLoad) = 1; GVAR(canLoad) = 1;

2
addons/cargo/XEH_postInit.sqf
View File

@ -86,7 +86,7 @@ GVAR(vehicleAction) = [
GVAR(enable) && GVAR(enable) &&
{alive _target} && {alive _target} &&
{locked _target < 2} && {locked _target < 2} &&
{(_target getVariable [QGVAR(hasCargo), getNumber (configOf _target >> QGVAR(hasCargo)) == 1])} && {_target getVariable [QGVAR(hasCargo), getNumber (configOf _target >> QGVAR(hasCargo)) == 1]} &&
{[_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith)} && {[_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith)} &&
{[_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew)} && {[_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew)} &&
{([_player, _target] call EFUNC(interaction,getInteractionDistance)) < MAX_LOAD_DISTANCE} {([_player, _target] call EFUNC(interaction,getInteractionDistance)) < MAX_LOAD_DISTANCE}

2
addons/cargo/functions/fnc_initVehicle.sqf
View File

@ -23,7 +23,7 @@ private _config = configOf _vehicle;
// If vehicle had space given to it via eden/public, then override config hasCargo setting // If vehicle had space given to it via eden/public, then override config hasCargo setting
private _hasCargoPublic = _vehicle getVariable QGVAR(hasCargo); private _hasCargoPublic = _vehicle getVariable QGVAR(hasCargo);
private _hasCargoPublicDefined = !isNil "_canLoadPublic"; private _hasCargoPublicDefined = !isNil "_hasCargoPublic";
if (_hasCargoPublicDefined && {!(_hasCargoPublic isEqualType false)}) then { if (_hasCargoPublicDefined && {!(_hasCargoPublic isEqualType false)}) then {
WARNING_4("%1[%2] - Variable %3 is %4 - Should be bool",_vehicle,_type,QGVAR(hasCargo),_hasCargoPublic); WARNING_4("%1[%2] - Variable %3 is %4 - Should be bool",_vehicle,_type,QGVAR(hasCargo),_hasCargoPublic);