From f7f6465ee47a01b4937f3c3f5b9d2de94322cd91 Mon Sep 17 00:00:00 2001 From: Timi007 Date: Thu, 8 Feb 2024 17:36:08 +0100 Subject: [PATCH] Fix padding a macro warning --- addons/markers/XEH_preInit.sqf | 2 +- .../fnc_convertCreateMarkerParams.sqf | 2 +- addons/markers/functions/fnc_copyMarker.sqf | 4 +-- addons/markers/functions/fnc_createMarker.sqf | 2 +- .../functions/fnc_createMarkerLocal.sqf | 26 +++++++++---------- addons/markers/functions/fnc_deleteMarker.sqf | 4 +-- .../functions/fnc_deleteMarkerLocal.sqf | 2 +- .../functions/fnc_generateUniquePrefix.sqf | 2 +- .../functions/fnc_getBroadcastChannel.sqf | 2 +- .../markers/functions/fnc_getMarkerAlpha.sqf | 2 +- .../markers/functions/fnc_getMarkerConfig.sqf | 2 +- .../markers/functions/fnc_getMarkerFamily.sqf | 2 +- addons/markers/functions/fnc_getMarkerPos.sqf | 2 +- .../markers/functions/fnc_getMarkerScale.sqf | 2 +- .../fnc_getMouseOverMarkerPrefix.sqf | 6 ++--- addons/markers/functions/fnc_getPlayerUID.sqf | 2 +- addons/markers/functions/fnc_getTimeZone.sqf | 2 +- .../functions/fnc_getTimeZoneIdentifier.sqf | 2 +- addons/markers/functions/fnc_getUIData.sqf | 2 +- .../markers/functions/fnc_initializeDTGUI.sqf | 2 +- addons/markers/functions/fnc_initializeUI.sqf | 2 +- addons/markers/functions/fnc_isMtsMarker.sqf | 2 +- .../functions/fnc_moveMarkerMouseDown.sqf | 6 ++--- addons/markers/functions/fnc_pasteMarker.sqf | 4 +-- addons/markers/functions/fnc_savePreset.sqf | 2 +- addons/markers/functions/fnc_setDTGUIData.sqf | 2 +- .../markers/functions/fnc_setMarkerAlpha.sqf | 4 +-- .../functions/fnc_setMarkerAlphaLocal.sqf | 2 +- addons/markers/functions/fnc_setMarkerPos.sqf | 4 +-- .../functions/fnc_setMarkerPosLocal.sqf | 2 +- .../functions/fnc_setMarkerPreview.sqf | 2 +- .../markers/functions/fnc_setMarkerScale.sqf | 4 +-- .../functions/fnc_setMarkerScaleLocal.sqf | 2 +- .../markers/functions/fnc_toDTGCharaters.sqf | 12 ++++----- 34 files changed, 61 insertions(+), 61 deletions(-) diff --git a/addons/markers/XEH_preInit.sqf b/addons/markers/XEH_preInit.sqf index ff8d91f..9aea2aa 100644 --- a/addons/markers/XEH_preInit.sqf +++ b/addons/markers/XEH_preInit.sqf @@ -10,7 +10,7 @@ ADDON = true; // Print version to rpt log private _version = getText (configFile >> "CfgPatches" >> "mts_markers" >> "versionStr"); -INFO_1("Metis Marker version: %1.", _version); +INFO_1("Metis Marker version: %1.",_version); //create namespace if (isServer || (!isMultiplayer)) then { diff --git a/addons/markers/functions/fnc_convertCreateMarkerParams.sqf b/addons/markers/functions/fnc_convertCreateMarkerParams.sqf index ef4ae68..12f40ed 100644 --- a/addons/markers/functions/fnc_convertCreateMarkerParams.sqf +++ b/addons/markers/functions/fnc_convertCreateMarkerParams.sqf @@ -41,6 +41,6 @@ if (_frameshape isEqualType "") then { _markerParameter set [0, [_frameshape, _dashedFrameshape, false]]; }; -TRACE_2("Converted createMarker params", _params, _createMarkerParams); +TRACE_2("Converted createMarker params",_params,_createMarkerParams); _params diff --git a/addons/markers/functions/fnc_copyMarker.sqf b/addons/markers/functions/fnc_copyMarker.sqf index b255ac2..37b5750 100644 --- a/addons/markers/functions/fnc_copyMarker.sqf +++ b/addons/markers/functions/fnc_copyMarker.sqf @@ -17,10 +17,10 @@ */ params [["_mapCtrl", controlNull, [controlNull]]]; -CHECKRET(isNull _mapCtrl, false); +CHECKRET(isNull _mapCtrl,false); private _namePrefix = [_mapCtrl, true] call FUNC(getMouseOverMarkerPrefix); -CHECKRET(_namePrefix isEqualTo "", false); +CHECKRET(_namePrefix isEqualTo "",false); private _scale = [_namePrefix] call FUNC(getMarkerScale); private _alpha = [_namePrefix] call FUNC(getMarkerAlpha); diff --git a/addons/markers/functions/fnc_createMarker.sqf b/addons/markers/functions/fnc_createMarker.sqf index c200dd9..2dbfee7 100644 --- a/addons/markers/functions/fnc_createMarker.sqf +++ b/addons/markers/functions/fnc_createMarker.sqf @@ -50,7 +50,7 @@ params [ ["_alpha", MARKER_ALPHA, [0]] ]; -CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)), ERROR("Channel ID not supported")); +CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)),ERROR("Channel ID not supported")); //get player UID private _playerUID = getPlayerUID player; diff --git a/addons/markers/functions/fnc_createMarkerLocal.sqf b/addons/markers/functions/fnc_createMarkerLocal.sqf index 68f683f..ba4859a 100644 --- a/addons/markers/functions/fnc_createMarkerLocal.sqf +++ b/addons/markers/functions/fnc_createMarkerLocal.sqf @@ -67,8 +67,8 @@ _markerParameter params [ _size params [["_grpsize", 0, [0]], ["_reinforced", false, [false]], ["_reduced", false, [false]]]; CHECK(!hasInterface); -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); -CHECKRET((_frameshape select 0) isEqualTo "", ERROR("No frameshape or wrong format. Expected format: [STRING, BOOLEAN, BOOLEAN]")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); +CHECKRET((_frameshape select 0) isEqualTo "",ERROR("No frameshape or wrong format. Expected format: [STRING, BOOLEAN, BOOLEAN]")); _frameshape params [["_identity", "", [""]], ["_dashedFrameshape", false, [false]], ["_isHq", false, [false]]]; _identity = toLower _identity; @@ -85,14 +85,14 @@ if (_alpha < 0 || _alpha > 1) then { }; if !(_identity in ["blu", "red", "neu", "unk"]) exitWith { - ERROR_1("Unknown Identity %1", _identity); + ERROR_1("Unknown Identity %1",_identity); }; -CHECKRET(_operationalCondition < 0 || _operationalCondition > 2, ERROR("Operational condition must be a number between 0 and 2.")); +CHECKRET(_operationalCondition < 0 || _operationalCondition > 2,ERROR("Operational condition must be a number between 0 and 2.")); _direction = toUpper _direction; if (_direction isNotEqualTo "" && {!(_direction in GVAR(directions))}) exitWith { - ERROR_2("Unknown direction of movement %1. Allowed values: %2", _direction, GVAR(directions) joinString ", "); + ERROR_2("Unknown direction of movement %1. Allowed values: %2",_direction,GVAR(directions) joinString ", "); }; //create frameshape marker @@ -121,7 +121,7 @@ private _frameshapeColor = if (GVAR(useVanillaColors)) then { } else { format ["mts_%1_color", _identity] }; -CHECKRET(_frameshapeColor isEqualTo "", ERROR_1("Could not get corresponding vanilla color for identity %1.", _identity)); +CHECKRET(_frameshapeColor isEqualTo "",ERROR_1("Could not get corresponding vanilla color for identity %1.",_identity)); _markerFrame setMarkerColorLocal _frameshapeColor; @@ -204,14 +204,14 @@ if (_additionalInfo isNotEqualTo "") then { // create text marker (bottom left of marker) if ((count _uniqueDesignation) > 0) then { - TRACE_1("uniqueDesignation input", _uniqueDesignation); + TRACE_1("uniqueDesignation input",_uniqueDesignation); scopeName "textLeftCreation"; + //only take the first three characters of the left text if ((count _uniqueDesignation) > UNIQUE_DESIGNATION_MAX_CHARS) then { _uniqueDesignation resize UNIQUE_DESIGNATION_MAX_CHARS; }; - //check if all characters are valid & make all characters uppercase { _x = toUpper _x; @@ -231,7 +231,7 @@ if ((count _uniqueDesignation) > 0) then { private _letter = _uniqueDesignation select _numIndex; ([_namePrefix, "uniqueDesignation", _letterPos, _letter] call FUNC(getCharMarkerType)) params ["_letterType", "_markerName"]; - TRACE_3("uniqueDesignation", _letter, _letterType, _markerName); + TRACE_3("uniqueDesignation",_letter,_letterType,_markerName); private _markerUniqueDesignation = createMarkerLocal [_markerName, _pos]; _markerUniqueDesignation setMarkerTypeLocal _letterType; @@ -246,9 +246,9 @@ if ((count _uniqueDesignation) > 0) then { // create text marker (bottom right of marker) if ((count _higherFormation) > 0) then { - TRACE_1("higherFormation input", _higherFormation); - + TRACE_1("higherFormation input",_higherFormation); scopeName "textRightCreation"; + //only take the first n characters of the left text if ((count _higherFormation) > HIGHER_FORMATION_MAX_CHARS) then { _higherFormation resize HIGHER_FORMATION_MAX_CHARS; @@ -270,7 +270,7 @@ if ((count _higherFormation) > 0) then { private _letter = _x; ([_namePrefix, "higherFormation", _forEachIndex, _letter] call FUNC(getCharMarkerType)) params ["_letterType", "_markerName"]; - TRACE_3("higherFormation", _letter, _letterType, _markerName); + TRACE_3("higherFormation",_letter,_letterType,_markerName); private _markerHigherFormation = createMarkerLocal [_markerName, _pos]; _markerHigherFormation setMarkerTypeLocal _letterType; @@ -304,7 +304,7 @@ if ((count _dateTimeGroup) > 0) then { // Returns array in format [D, D, H, H, M, M, Z, mmm, Y, Y]. private _dtgCharacters = _dateTimeGroup call FUNC(toDTGCharaters); - CHECKRET(_dtgCharacters isEqualTo [], WARNING_1("Date-Time Group is invalid. Will not create DTG markers. DTG: %1", _dateTimeGroup)); + CHECKRET(_dtgCharacters isEqualTo [],WARNING_1("Date-Time Group is invalid. Will not create DTG markers. DTG: %1",_dateTimeGroup)); // Iterate reversed because char pos starts closest to frameshape, meaning with the year. // DDHHMMZmmmYY ┌───────┐ diff --git a/addons/markers/functions/fnc_deleteMarker.sqf b/addons/markers/functions/fnc_deleteMarker.sqf index 11bcc72..744f4bc 100644 --- a/addons/markers/functions/fnc_deleteMarker.sqf +++ b/addons/markers/functions/fnc_deleteMarker.sqf @@ -18,12 +18,12 @@ params [["_namePrefix", "", [""]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix"); false); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix"); false); //get channel ID from marker prefix private _broadcastChannel = [_namePrefix] call FUNC(getBroadcastChannel); -CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)), ERROR("Invalid marker prefix. No MTS marker"); false); +CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)),ERROR("Invalid marker prefix. No MTS marker"); false); //broadcast marker depending on channel ID [_namePrefix] remoteExecCall [QFUNC(deleteMarkerLocal), ([_broadcastChannel] call FUNC(getBroadcastTargets)), true]; diff --git a/addons/markers/functions/fnc_deleteMarkerLocal.sqf b/addons/markers/functions/fnc_deleteMarkerLocal.sqf index 0bcb809..afabc98 100644 --- a/addons/markers/functions/fnc_deleteMarkerLocal.sqf +++ b/addons/markers/functions/fnc_deleteMarkerLocal.sqf @@ -19,7 +19,7 @@ params [["_namePrefix", "", [""]]]; CHECK(!hasInterface); -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); //get marker set private _markerFamily = [_namePrefix] call FUNC(getMarkerFamily); diff --git a/addons/markers/functions/fnc_generateUniquePrefix.sqf b/addons/markers/functions/fnc_generateUniquePrefix.sqf index 1364bb2..4292af7 100644 --- a/addons/markers/functions/fnc_generateUniquePrefix.sqf +++ b/addons/markers/functions/fnc_generateUniquePrefix.sqf @@ -21,7 +21,7 @@ params [["_editable", true, [true]], ["_broadcastChannel", -1, [0]], ["_playerUID", "0", [""]]]; private ["_namePrefix"]; -CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)), ERROR("Channel ID not supported")); +CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)),ERROR("Channel ID not supported")); //generate unique marker name & return private _uniqueName = false; diff --git a/addons/markers/functions/fnc_getBroadcastChannel.sqf b/addons/markers/functions/fnc_getBroadcastChannel.sqf index 5ad9f27..b808e3f 100644 --- a/addons/markers/functions/fnc_getBroadcastChannel.sqf +++ b/addons/markers/functions/fnc_getBroadcastChannel.sqf @@ -18,7 +18,7 @@ params [["_namePrefix", "", [""]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); switch ([_namePrefix] call FUNC(isMtsMarker)) do { case 1: { diff --git a/addons/markers/functions/fnc_getMarkerAlpha.sqf b/addons/markers/functions/fnc_getMarkerAlpha.sqf index 848b6bd..b759f83 100644 --- a/addons/markers/functions/fnc_getMarkerAlpha.sqf +++ b/addons/markers/functions/fnc_getMarkerAlpha.sqf @@ -18,6 +18,6 @@ params [["_namePrefix", "", [""]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); (markerAlpha format ["%1_frame", _namePrefix]) diff --git a/addons/markers/functions/fnc_getMarkerConfig.sqf b/addons/markers/functions/fnc_getMarkerConfig.sqf index 649190a..440183d 100644 --- a/addons/markers/functions/fnc_getMarkerConfig.sqf +++ b/addons/markers/functions/fnc_getMarkerConfig.sqf @@ -31,6 +31,6 @@ params [["_namePrefix", "", [""]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); (GVAR(namespace) getVariable [_namePrefix, []]) param [1, []] diff --git a/addons/markers/functions/fnc_getMarkerFamily.sqf b/addons/markers/functions/fnc_getMarkerFamily.sqf index 6bc3ce0..b9c60b0 100644 --- a/addons/markers/functions/fnc_getMarkerFamily.sqf +++ b/addons/markers/functions/fnc_getMarkerFamily.sqf @@ -17,7 +17,7 @@ */ params [["_namePrefix", "", [""]]]; -CHECKRET(_namePrefix isEqualTo "", []); +CHECKRET(_namePrefix isEqualTo "",[]); private _markerInformation = GVAR(namespace) getVariable [_namePrefix, [[]]]; diff --git a/addons/markers/functions/fnc_getMarkerPos.sqf b/addons/markers/functions/fnc_getMarkerPos.sqf index 88355c7..2f99df5 100644 --- a/addons/markers/functions/fnc_getMarkerPos.sqf +++ b/addons/markers/functions/fnc_getMarkerPos.sqf @@ -19,6 +19,6 @@ params [["_namePrefix", "", [""]], ["_preserveElevation", false, [false]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); getMarkerPos [format["%1_frame", _namePrefix], _preserveElevation] diff --git a/addons/markers/functions/fnc_getMarkerScale.sqf b/addons/markers/functions/fnc_getMarkerScale.sqf index 411db46..2d1f613 100644 --- a/addons/markers/functions/fnc_getMarkerScale.sqf +++ b/addons/markers/functions/fnc_getMarkerScale.sqf @@ -18,6 +18,6 @@ params [["_namePrefix", "", [""]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); (getMarkerSize format ["%1_frame", _namePrefix]) select 0 diff --git a/addons/markers/functions/fnc_getMouseOverMarkerPrefix.sqf b/addons/markers/functions/fnc_getMouseOverMarkerPrefix.sqf index 4bf2db9..b2875cf 100644 --- a/addons/markers/functions/fnc_getMouseOverMarkerPrefix.sqf +++ b/addons/markers/functions/fnc_getMouseOverMarkerPrefix.sqf @@ -18,15 +18,15 @@ */ params [["_mapCtrl", controlNull, [controlNull]], ["_includeNoEditMarker", false, [false]]]; -CHECKRET(isNull _mapCtrl, ""); +CHECKRET(isNull _mapCtrl,""); private _mouseOverMarker = ctrlMapMouseOver _mapCtrl; private _type = _mouseOverMarker param [0, ""]; -CHECKRET(_type isNotEqualTo "marker", ""); +CHECKRET(_type isNotEqualTo "marker",""); private _markerName = _mouseOverMarker select 1; private _isMtsMarker = [_markerName] call FUNC(isMtsMarker); -CHECKRET(_isMtsMarker isEqualTo 0, ""); +CHECKRET(_isMtsMarker isEqualTo 0,""); if (_isMtsMarker isEqualTo 1 || _includeNoEditMarker) exitWith { (_markerName splitString "_") select 0 diff --git a/addons/markers/functions/fnc_getPlayerUID.sqf b/addons/markers/functions/fnc_getPlayerUID.sqf index 9df4953..3341d35 100644 --- a/addons/markers/functions/fnc_getPlayerUID.sqf +++ b/addons/markers/functions/fnc_getPlayerUID.sqf @@ -18,7 +18,7 @@ params [["_namePrefix", "", [""]]]; -CHECKRET([_namePrefix] call FUNC(isMtsMarker) isNotEqualTo 1, QUOTE(-1)); +CHECKRET([_namePrefix] call FUNC(isMtsMarker) isNotEqualTo 1,"-1"); (_namePrefix splitString "/") param [1, "-1"] diff --git a/addons/markers/functions/fnc_getTimeZone.sqf b/addons/markers/functions/fnc_getTimeZone.sqf index f05ae85..d81ddc9 100644 --- a/addons/markers/functions/fnc_getTimeZone.sqf +++ b/addons/markers/functions/fnc_getTimeZone.sqf @@ -22,7 +22,7 @@ params [["_time", [], [[]], [2, 7]], ["_timeUtc", [], [[]], [2, 7]]]; -CHECKRET((_time isEqualTo []) || (_timeUtc isEqualTo []), []); +CHECKRET((_time isEqualTo []) || (_timeUtc isEqualTo []),[]); // time is passed from systemTime command if ((count _time) isEqualTo 7) then { diff --git a/addons/markers/functions/fnc_getTimeZoneIdentifier.sqf b/addons/markers/functions/fnc_getTimeZoneIdentifier.sqf index 40af077..6394ea0 100644 --- a/addons/markers/functions/fnc_getTimeZoneIdentifier.sqf +++ b/addons/markers/functions/fnc_getTimeZoneIdentifier.sqf @@ -20,7 +20,7 @@ params [["_time", [], [[]]], ["_timeUtc", [], [[]]]]; private _timeZone = [_time, _timeUtc] call FUNC(getTimeZone); // _timeDiffH hour is in range -12..+12 -CHECKRET(_timeZone isEqualTo [], ""); +CHECKRET(_timeZone isEqualTo [],""); // Simplify time zones according to ATP 6-02.70 Appendix E // Do not consider the minutes diff --git a/addons/markers/functions/fnc_getUIData.sqf b/addons/markers/functions/fnc_getUIData.sqf index 72fa71e..5ddf5a7 100644 --- a/addons/markers/functions/fnc_getUIData.sqf +++ b/addons/markers/functions/fnc_getUIData.sqf @@ -20,7 +20,7 @@ private _mainDisplay = findDisplay MAIN_DISPLAY; //get identity private _identity = (_mainDisplay displayCtrl FRIENDLY_BTN_FRAME) getVariable [QGVAR(currentIdentitySelected), ""]; -CHECKRET(_identity isEqualTo "", ERROR("No identity")); +CHECKRET(_identity isEqualTo "",ERROR("No identity")); // Check if frameshape is dashed or HQ private _dashedFrameshape = cbChecked (_mainDisplay displayCtrl SUSPECT_CHECKBOX); diff --git a/addons/markers/functions/fnc_initializeDTGUI.sqf b/addons/markers/functions/fnc_initializeDTGUI.sqf index 698828f..94d4593 100644 --- a/addons/markers/functions/fnc_initializeDTGUI.sqf +++ b/addons/markers/functions/fnc_initializeDTGUI.sqf @@ -22,7 +22,7 @@ params [["_parentDisplay", displayNull, [displayNull]]]; // Open Date-Time Group configuration private _dtgDisplay = _parentDisplay createDisplay QGVAR(DTGDialog); -CHECKRET(isNull _dtgDisplay, ERROR("Failed to create DTG dialog")); +CHECKRET(isNull _dtgDisplay,ERROR("Failed to create DTG dialog")); private _dateYearCtrl = _dtgDisplay displayCtrl DTG_YEAR_DROPDOWN; private _dateMonthCtrl = _dtgDisplay displayCtrl DTG_MONTH_DROPDOWN; diff --git a/addons/markers/functions/fnc_initializeUI.sqf b/addons/markers/functions/fnc_initializeUI.sqf index 687cea8..9231917 100644 --- a/addons/markers/functions/fnc_initializeUI.sqf +++ b/addons/markers/functions/fnc_initializeUI.sqf @@ -24,7 +24,7 @@ params [["_curMapDisplay", displayNull, [displayNull]], ["_mousePos", [0,0], [[] //Open interface private _displayCheck = _curMapDisplay createDisplay QGVAR(Dialog); -CHECKRET(isNull _displayCheck, ERROR("Failed to create dialog")); +CHECKRET(isNull _displayCheck,ERROR("Failed to create dialog")); private _mainDisplay = findDisplay MAIN_DISPLAY; private _mapCtrl = _curMapDisplay displayCtrl MAP_CTRL; diff --git a/addons/markers/functions/fnc_isMtsMarker.sqf b/addons/markers/functions/fnc_isMtsMarker.sqf index c511541..c63387d 100644 --- a/addons/markers/functions/fnc_isMtsMarker.sqf +++ b/addons/markers/functions/fnc_isMtsMarker.sqf @@ -17,7 +17,7 @@ */ params [["_markerName", "", [""]]]; -CHECKRET(_markerName isEqualTo "", 0); +CHECKRET(_markerName isEqualTo "",0); private _markerNamePrefix = toLower (_markerName select [0, 9]); diff --git a/addons/markers/functions/fnc_moveMarkerMouseDown.sqf b/addons/markers/functions/fnc_moveMarkerMouseDown.sqf index 0e78339..624ce28 100644 --- a/addons/markers/functions/fnc_moveMarkerMouseDown.sqf +++ b/addons/markers/functions/fnc_moveMarkerMouseDown.sqf @@ -18,15 +18,15 @@ */ params [["_mapCtrl", controlNull, [controlNull]], ["_includeNoEditMarker", false, [false]]]; -CHECKRET(isNull _mapCtrl, false); +CHECKRET(isNull _mapCtrl,false); //get marker prefix private _namePrefix = [_mapCtrl, _includeNoEditMarker] call FUNC(getMouseOverMarkerPrefix); -CHECKRET(_namePrefix isEqualTo "", false); +CHECKRET(_namePrefix isEqualTo "",false); //get marker set private _markerFamily = [_namePrefix] call FUNC(getMarkerFamily); -CHECKRET(_markerFamily isEqualTo [], false); +CHECKRET(_markerFamily isEqualTo [],false); private _originAlpha = markerAlpha (_markerFamily select 0); diff --git a/addons/markers/functions/fnc_pasteMarker.sqf b/addons/markers/functions/fnc_pasteMarker.sqf index d10db31..57fe5e8 100644 --- a/addons/markers/functions/fnc_pasteMarker.sqf +++ b/addons/markers/functions/fnc_pasteMarker.sqf @@ -19,12 +19,12 @@ private _params = params [["_mapCtrl", controlNull, [controlNull]], ["_mousepos", [0,0], [[]], [2]]]; -CHECKRET((GVAR(clipboard) isEqualTo "" || !_params), false); +CHECKRET((GVAR(clipboard) isEqualTo "" || !_params),false); GVAR(clipboard) params ["_namePrefix", "_scale", "_alpha"]; private _markerInformation = GVAR(namespace) getVariable [_namePrefix, []]; -CHECKRET(_markerInformation isEqualTo [], false); +CHECKRET(_markerInformation isEqualTo [],false); _markerInformation params ["", "_markerParameter"]; diff --git a/addons/markers/functions/fnc_savePreset.sqf b/addons/markers/functions/fnc_savePreset.sqf index 9361b18..acc9ff3 100644 --- a/addons/markers/functions/fnc_savePreset.sqf +++ b/addons/markers/functions/fnc_savePreset.sqf @@ -20,7 +20,7 @@ private _mainDisplay = findDisplay MAIN_DISPLAY; //get the name of the Preset private _presetName = ctrlText (_mainDisplay displayCtrl NAME_PRESETS_EDIT); -CHECKRET(_presetName isEqualTo "", hint LLSTRING(ui_hint_marker_name_empty)); +CHECKRET(_presetName isEqualTo "",hint LLSTRING(ui_hint_marker_name_empty)); //get all marker data for the Preset private _UIData = call FUNC(getUIData); diff --git a/addons/markers/functions/fnc_setDTGUIData.sqf b/addons/markers/functions/fnc_setDTGUIData.sqf index 37ba2d8..1c42d56 100644 --- a/addons/markers/functions/fnc_setDTGUIData.sqf +++ b/addons/markers/functions/fnc_setDTGUIData.sqf @@ -20,7 +20,7 @@ */ params [["_date", [], [[]], [5, 6, 7]], ["_timeZone", "J", [""]], ["_displayShort", nil, [false]]]; -TRACE_1("params", _this); +TRACE_1("params",_this); CHECK(_date isEqualTo []); diff --git a/addons/markers/functions/fnc_setMarkerAlpha.sqf b/addons/markers/functions/fnc_setMarkerAlpha.sqf index 2e215bd..01b6d91 100644 --- a/addons/markers/functions/fnc_setMarkerAlpha.sqf +++ b/addons/markers/functions/fnc_setMarkerAlpha.sqf @@ -20,12 +20,12 @@ params [["_namePrefix", "", [""]], ["_alpha", MARKER_ALPHA, [0]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); // Get channel ID from marker prefix private _broadcastChannel = [_namePrefix] call FUNC(getBroadcastChannel); -CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)), ERROR("Invalid marker prefix. No MTS marker")); +CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)),ERROR("Invalid marker prefix. No MTS marker")); // Broadcast marker depending on channel ID [_namePrefix, _alpha] remoteExecCall [QFUNC(setMarkerAlphaLocal), ([_broadcastChannel] call FUNC(getBroadcastTargets)), true]; diff --git a/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf b/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf index 8283136..7a0e69b 100644 --- a/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf +++ b/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf @@ -22,7 +22,7 @@ params [["_namePrefix", "", [""]], ["_alpha", MARKER_ALPHA, [0]]]; CHECK(!hasInterface); -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); // Get marker set private _markerFamily = [_namePrefix] call FUNC(getMarkerFamily); diff --git a/addons/markers/functions/fnc_setMarkerPos.sqf b/addons/markers/functions/fnc_setMarkerPos.sqf index 98a7bd5..88bb74d 100644 --- a/addons/markers/functions/fnc_setMarkerPos.sqf +++ b/addons/markers/functions/fnc_setMarkerPos.sqf @@ -19,12 +19,12 @@ params [["_namePrefix", "", [""]], ["_newPos", [0,0], [[]], [2,3]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); //get channel ID from marker prefix private _broadcastChannel = [_namePrefix] call FUNC(getBroadcastChannel); -CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)), ERROR("Invalid marker prefix. No MTS marker")); +CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)),ERROR("Invalid marker prefix. No MTS marker")); //broadcast marker depending on channel ID [_namePrefix, _newPos] remoteExecCall [QFUNC(setMarkerPosLocal), ([_broadcastChannel] call FUNC(getBroadcastTargets)), true]; diff --git a/addons/markers/functions/fnc_setMarkerPosLocal.sqf b/addons/markers/functions/fnc_setMarkerPosLocal.sqf index fd8a2e3..76871ad 100644 --- a/addons/markers/functions/fnc_setMarkerPosLocal.sqf +++ b/addons/markers/functions/fnc_setMarkerPosLocal.sqf @@ -20,7 +20,7 @@ params [["_namePrefix", "", [""]], ["_newPos", [0,0], [[]], [2,3]]]; CHECK(!hasInterface); -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); //get marker set private _markerFamily = [_namePrefix] call FUNC(getMarkerFamily); diff --git a/addons/markers/functions/fnc_setMarkerPreview.sqf b/addons/markers/functions/fnc_setMarkerPreview.sqf index e0de3a1..d6cef82 100644 --- a/addons/markers/functions/fnc_setMarkerPreview.sqf +++ b/addons/markers/functions/fnc_setMarkerPreview.sqf @@ -38,7 +38,7 @@ _size params [ ["_reduced", false, [false]] ]; -CHECKRET(_identity isEqualTo "", ERROR("No identity")); +CHECKRET(_identity isEqualTo "",ERROR("No identity")); private _mainDisplay = findDisplay MAIN_DISPLAY; private _previewIdentityCtrl = _mainDisplay displayCtrl PREVIEW_LYR_IDENTITY; diff --git a/addons/markers/functions/fnc_setMarkerScale.sqf b/addons/markers/functions/fnc_setMarkerScale.sqf index b58b382..a1004f8 100644 --- a/addons/markers/functions/fnc_setMarkerScale.sqf +++ b/addons/markers/functions/fnc_setMarkerScale.sqf @@ -19,12 +19,12 @@ params [["_namePrefix", "", [""]], ["_newScale", MARKER_SCALE, [0]]]; -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); //get channel ID from marker prefix private _broadcastChannel = [_namePrefix] call FUNC(getBroadcastChannel); -CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)), ERROR("Invalid marker prefix. No MTS marker")); +CHECKRET(((_broadcastChannel > 5) || (_broadcastChannel < -1)),ERROR("Invalid marker prefix. No MTS marker")); //broadcast marker depending on channel ID [_namePrefix, _newScale] remoteExecCall [QFUNC(setMarkerScaleLocal), ([_broadcastChannel] call FUNC(getBroadcastTargets)), true]; diff --git a/addons/markers/functions/fnc_setMarkerScaleLocal.sqf b/addons/markers/functions/fnc_setMarkerScaleLocal.sqf index 10c0dc3..2adc789 100644 --- a/addons/markers/functions/fnc_setMarkerScaleLocal.sqf +++ b/addons/markers/functions/fnc_setMarkerScaleLocal.sqf @@ -20,7 +20,7 @@ params [["_namePrefix", "", [""]], ["_newScale", MARKER_SCALE, [0]]]; CHECK(!hasInterface); -CHECKRET(_namePrefix isEqualTo "", ERROR("No marker prefix")); +CHECKRET(_namePrefix isEqualTo "",ERROR("No marker prefix")); //get marker set private _markerFamily = [_namePrefix] call FUNC(getMarkerFamily); diff --git a/addons/markers/functions/fnc_toDTGCharaters.sqf b/addons/markers/functions/fnc_toDTGCharaters.sqf index 286d39f..e7daeac 100644 --- a/addons/markers/functions/fnc_toDTGCharaters.sqf +++ b/addons/markers/functions/fnc_toDTGCharaters.sqf @@ -21,16 +21,16 @@ */ params [["_date", [], [[]], [5, 6, 7]], ["_timeZone", "J", [""]], ["_displayShort", false, [false]]]; -TRACE_2("params", _date, _timeZone); +TRACE_1("params",_this); -CHECKRET((_date isEqualTo []) || (count _timeZone != 1), []); +CHECKRET((_date isEqualTo []) || (count _timeZone != 1),[]); _date params [["_year", MIN_YEAR, [0]], ["_month", 1, [0]], ["_day", 1, [0]], ["_hour", 0, [0]], ["_minute", 0, [0]]]; -CHECKRET(_month < 1 || _month > 12, []); -CHECKRET(_day < 1 || _day > 31, []); -CHECKRET(_hour < 0 || _hour > 23, []); -CHECKRET(_minute < 0 || _minute > 59, []); +CHECKRET(_month < 1 || _month > 12,[]); +CHECKRET(_day < 1 || _day > 31,[]); +CHECKRET(_hour < 0 || _hour > 23,[]); +CHECKRET(_minute < 0 || _minute > 59,[]); private _hourStr = [_hour, 2] call CBA_fnc_formatNumber; private _minuteStr = [_minute, 2] call CBA_fnc_formatNumber;