From c42a004ab38bf931bfe3f701cd155eaf74d18e19 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Sat, 29 Feb 2020 23:09:31 +0100
Subject: [PATCH] General - Fix preprocessor issues (#7563)

* Fix preprocessor issues

* Fix more preprocessor issues
---
 addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf | 2 +-
 addons/javelin/script_component.hpp                       | 1 -
 addons/medical_treatment/functions/fnc_fullHealLocal.sqf  | 2 +-
 addons/missileguidance/functions/fnc_seekerType_ARH.sqf   | 8 ++++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf b/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
index 1e64bf82f5..1a88c7f115 100644
--- a/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
+++ b/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
@@ -21,7 +21,7 @@
  */
 
 params ["_vehicle", "_turretPath", "_carryMag", "_vehMag", "_unit"];
-TRACE_6("removeTurretMag EH",_vehicle,_turretPath,_carryMag,_vehMag,_unit);
+TRACE_5("removeTurretMag EH",_vehicle,_turretPath,_carryMag,_vehMag,_unit);
 
 TRACE_3("",local _vehicle, _vehicle turretLocal _turretPath,local _unit);
 if (!(_vehicle turretLocal _turretPath)) exitWith {};
diff --git a/addons/javelin/script_component.hpp b/addons/javelin/script_component.hpp
index b78032439d..3e9ad4ebfc 100644
--- a/addons/javelin/script_component.hpp
+++ b/addons/javelin/script_component.hpp
@@ -26,7 +26,6 @@
 #define __JavelinIGUISeek (__JavelinIGUI displayCtrl 699000)
 #define __JavelinIGUITop (__JavelinIGUI displayCtrl 699001)
 #define __JavelinIGUIDir (__JavelinIGUI displayCtrl 699002)
-#define __JavelinIGUIRangefinder (__JavelinIGUI displayCtrl 151)
 
 // Constrains
 #define __JavelinIGUITargetingConstrains (__JavelinIGUI displayCtrl 699100)
diff --git a/addons/medical_treatment/functions/fnc_fullHealLocal.sqf b/addons/medical_treatment/functions/fnc_fullHealLocal.sqf
index d292394eb6..b1e64afa42 100644
--- a/addons/medical_treatment/functions/fnc_fullHealLocal.sqf
+++ b/addons/medical_treatment/functions/fnc_fullHealLocal.sqf
@@ -67,7 +67,7 @@ if IS_UNCONSCIOUS(_patient) then {
     [QEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent;
     _state = GET_SM_STATE(_patient);
     TRACE_1("after WakeUp",_state);
-    if IS_UNCONSCIOUS(_patient) then { ERROR_1("fullheal [unit %1][state %2] failed to wake up patient",_patient,_state); };
+    if IS_UNCONSCIOUS(_patient) then { ERROR_2("fullheal [unit %1][state %2] failed to wake up patient",_patient,_state); };
 };
 
 // Generic medical admin
diff --git a/addons/missileguidance/functions/fnc_seekerType_ARH.sqf b/addons/missileguidance/functions/fnc_seekerType_ARH.sqf
index 4f098f6cae..9244090af7 100644
--- a/addons/missileguidance/functions/fnc_seekerType_ARH.sqf
+++ b/addons/missileguidance/functions/fnc_seekerType_ARH.sqf
@@ -28,7 +28,7 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then {
     };
     if !(_wasActive) then {
         _seekerStateParams set [6, true];
-        TRACE_1("Missile Pitbull");
+        TRACE_1("Missile Pitbull",_seekerStateParams);
     };
     // Internal radar homing
     // For performance reasons only poll for target every so often instead of each frame
@@ -39,12 +39,12 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then {
             // no target pos - shot without lock. Have the missile's radar search infront of it on the ground
             _searchPos = (getPosASL _projectile) vectorAdd (_projectile vectorModelToWorld [0, _seekerMaxRange, -((getPos _projectile)#2)]);
         };
-    
+
         _target = objNull;
         _lastTargetPollTime = CBA_missionTime;
         _seekerStateParams set [4, _lastTargetPollTime];
         private _distanceToExpectedTarget = _seekerMaxRange min ((getPosASL _projectile) vectorDistance _searchPos);
-        
+
         // Simulate how much the seeker can see at the ground
         private _projDir = vectorDir _projectile;
         private _projYaw = getDir _projectile;
@@ -70,7 +70,7 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then {
             };
         };
         _nearestObjects = _nearestObjects select { !isNull _x };
-        
+
         // Select closest object to the expected position to be the current radar target
         if ((count _nearestObjects) <= 0) exitWith {
             _projectile setMissileTarget objNull;