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

General - Fix preprocessor issues (#7563)

Browse Source 
* Fix preprocessor issues

* Fix more preprocessor issues
This commit is contained in:
jonpas 2020-02-29 23:09:31 +01:00 committed by GitHub
parent 15b4b98e5b
commit c42a004ab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
View File

@ -21,7 +21,7 @@
*/ */
params ["_vehicle", "_turretPath", "_carryMag", "_vehMag", "_unit"]; 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); TRACE_3("",local _vehicle, _vehicle turretLocal _turretPath,local _unit);
if (!(_vehicle turretLocal _turretPath)) exitWith {}; if (!(_vehicle turretLocal _turretPath)) exitWith {};

1
addons/javelin/script_component.hpp
View File

@ -26,7 +26,6 @@
#define __JavelinIGUISeek (__JavelinIGUI displayCtrl 699000) #define __JavelinIGUISeek (__JavelinIGUI displayCtrl 699000)
#define __JavelinIGUITop (__JavelinIGUI displayCtrl 699001) #define __JavelinIGUITop (__JavelinIGUI displayCtrl 699001)
#define __JavelinIGUIDir (__JavelinIGUI displayCtrl 699002) #define __JavelinIGUIDir (__JavelinIGUI displayCtrl 699002)
#define __JavelinIGUIRangefinder (__JavelinIGUI displayCtrl 151)
// Constrains // Constrains
#define __JavelinIGUITargetingConstrains (__JavelinIGUI displayCtrl 699100) #define __JavelinIGUITargetingConstrains (__JavelinIGUI displayCtrl 699100)

2
addons/medical_treatment/functions/fnc_fullHealLocal.sqf
View File

@ -67,7 +67,7 @@ if IS_UNCONSCIOUS(_patient) then {
[QEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent; [QEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent;
_state = GET_SM_STATE(_patient); _state = GET_SM_STATE(_patient);
TRACE_1("after WakeUp",_state); 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 // Generic medical admin

8
addons/missileguidance/functions/fnc_seekerType_ARH.sqf
View File

@ -28,7 +28,7 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then {
}; };
if !(_wasActive) then { if !(_wasActive) then {
_seekerStateParams set [6, true]; _seekerStateParams set [6, true];
TRACE_1("Missile Pitbull"); TRACE_1("Missile Pitbull",_seekerStateParams);
}; };
// Internal radar homing // Internal radar homing
// For performance reasons only poll for target every so often instead of each frame // 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 // 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)]); _searchPos = (getPosASL _projectile) vectorAdd (_projectile vectorModelToWorld [0, _seekerMaxRange, -((getPos _projectile)#2)]);
}; };
_target = objNull; _target = objNull;
_lastTargetPollTime = CBA_missionTime; _lastTargetPollTime = CBA_missionTime;
_seekerStateParams set [4, _lastTargetPollTime]; _seekerStateParams set [4, _lastTargetPollTime];
private _distanceToExpectedTarget = _seekerMaxRange min ((getPosASL _projectile) vectorDistance _searchPos); private _distanceToExpectedTarget = _seekerMaxRange min ((getPosASL _projectile) vectorDistance _searchPos);
// Simulate how much the seeker can see at the ground // Simulate how much the seeker can see at the ground
private _projDir = vectorDir _projectile; private _projDir = vectorDir _projectile;
private _projYaw = getDir _projectile; private _projYaw = getDir _projectile;
@ -70,7 +70,7 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then {
}; };
}; };
_nearestObjects = _nearestObjects select { !isNull _x }; _nearestObjects = _nearestObjects select { !isNull _x };
// Select closest object to the expected position to be the current radar target // Select closest object to the expected position to be the current radar target
if ((count _nearestObjects) <= 0) exitWith { if ((count _nearestObjects) <= 0) exitWith {
_projectile setMissileTarget objNull; _projectile setMissileTarget objNull;