diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp index bd31a9c659..1b34af87de 100644 --- a/addons/cargo/CfgVehicles.hpp +++ b/addons/cargo/CfgVehicles.hpp @@ -426,41 +426,43 @@ class CfgVehicles { class Land_CanisterFuel_F: Items_base_F { GVAR(size) = 1; GVAR(canLoad) = 1; - EGVAR(cargo,noRename) = 1; + GVAR(noRename) = 1; }; // Flexible Fuel tanks, 300L class FlexibleTank_base_F: ThingX { GVAR(size) = 3; GVAR(canLoad) = 1; + GVAR(noRename) = 1; }; // objects class RoadCone_F: ThingX { GVAR(size) = 1; GVAR(canLoad) = 1; - EGVAR(cargo,noRename) = 1; + GVAR(noRename) = 1; }; class RoadBarrier_F: RoadCone_F { GVAR(size) = 2; + GVAR(noRename) = 1; }; class Lamps_base_F; class Land_PortableLight_single_F: Lamps_base_F { GVAR(size) = 2; GVAR(canLoad) = 1; - EGVAR(cargo,noRename) = 1; + GVAR(noRename) = 1; }; class FloatingStructure_F; class Land_Camping_Light_F: FloatingStructure_F { GVAR(size) = 0.2; GVAR(canLoad) = 1; - EGVAR(cargo,noRename) = 1; + GVAR(noRename) = 1; }; class Land_Camping_Light_off_F: ThingX { GVAR(size) = 0.2; GVAR(canLoad) = 1; - EGVAR(cargo,noRename) = 1; + GVAR(noRename) = 1; }; diff --git a/addons/cargo/functions/fnc_getNameItem.sqf b/addons/cargo/functions/fnc_getNameItem.sqf index ac97dd51dc..60f76fc3c9 100644 --- a/addons/cargo/functions/fnc_getNameItem.sqf +++ b/addons/cargo/functions/fnc_getNameItem.sqf @@ -18,8 +18,11 @@ params ["_object", ["_addCustomPart", false]]; -private _class = if (_object isEqualType "") then {_object} else {typeOf _object}; -private _displayName = getText (configFile >> "CfgVehicles" >> _class >> "displayName"); +private _displayName = if (_object isEqualType "") then { + getText (configFile >> "CfgVehicles" >> _object >> "displayName") +} else { + getText ((configOf _object) >> "displayName") +}; if (_addCustomPart && {!(_object isEqualType "")}) then { private _customPart = _object getVariable [QGVAR(customName), ""];