Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

General - Fix preprocessor issues #7563

Merged
merged 2 commits into from
Feb 29, 2020
Merged

General - Fix preprocessor issues #7563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f69733
Fix preprocessor issues
jonpas Feb 29, 2020
e41461d
Fix more preprocessor issues
jonpas Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down
1 change: 0 additions & 1 deletion addons/javelin/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion addons/medical_treatment/functions/fnc_fullHealLocal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions addons/missileguidance/functions/fnc_seekerType_ARH.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand All @@ -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;
Expand Down