Merge pull request #1701 from CBATeam/hemttLint

Common - Use `objectParent` for vehicle detection (HEMTT L-S18)
CBATeam · Nov 10, 2024 · d2c0e07 · d2c0e07
2 parents f592bff + b5d6c0b
commit d2c0e07
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.hemtt/lints.toml b/.hemtt/lints.toml
@@ -2,3 +2,8 @@
 options.ignore = [
     "addPublicVariableEventHandler", # Alt syntax is broken, we are using main syntax
 ]
+
+[sqf.var_all_caps]
+options.ignore = [
+    "SLX_*"
+]
diff --git a/addons/common/fnc_canUseWeapon.sqf b/addons/common/fnc_canUseWeapon.sqf
@@ -23,7 +23,7 @@ SCRIPT(canUseWeapon);
 
 params [["_unit", objNull, [objNull]]];
 
-if (_unit == vehicle _unit) exitWith {true};
+if (isNull objectParent _unit) exitWith {true};
 
 private _config = configFile >> "CfgMovesMaleSdr" >> "States" >> animationState _unit;
 

diff --git a/addons/common/fnc_deleteEntity.sqf b/addons/common/fnc_deleteEntity.sqf
@@ -30,7 +30,7 @@ switch (typeName _entity) do {
         } forEach _entity;
     };
     case "OBJECT" : {
-        if (vehicle _entity != _entity) then {
+        if (!isNull objectParent _entity) then {
             unassignVehicle _entity;
             _entity setPosASL [0,0,0];
         } else {

diff --git a/addons/common/fnc_getUnitAnim.sqf b/addons/common/fnc_getUnitAnim.sqf
@@ -32,7 +32,7 @@ private _anim = toArray(toLower(animationState _unit));
 private _upos = "unknown";
 private _umov = "stop";
 
-if (vehicle _unit!= _unit) then {
+if (!isNull objectParent _unit) then {
     _upos = "vehicle";
 } else {
     if (count _anim < 12) exitWith {};

diff --git a/addons/common/fnc_getUnitDeathAnim.sqf b/addons/common/fnc_getUnitDeathAnim.sqf
@@ -27,7 +27,7 @@ private _deathAnim = "";
 private _curAnim = (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState _unit));
 
 if (isText (_curAnim >> "actions")) then {
-    if (vehicle _unit == _unit) then {
+    if (isNull objectParent _unit) then {
         private _deathAnimCfg = (configFile >> "CfgMovesBasic" >> "Actions" >> (getText (_curAnim >> "actions")) >> "die");
         if (isText _deathAnimCfg) then {
             _deathAnim = getText _deathAnimCfg;