From b28f320fa70149d4749717f653a9ec611b4b2b93 Mon Sep 17 00:00:00 2001 From: R3voA3 Date: Wed, 4 Sep 2024 09:29:42 +0200 Subject: [PATCH] updated command casing and added sqf lint settings --- .hemtt/project.toml | 21 ++++- addons/main/GUI/RscDebugConsole.hpp | 2 +- addons/main/GUI/functionsViewer.hpp | 76 +++++++++---------- addons/main/GUI/placementTools.hpp | 2 +- .../attributesMission/establishingShot.hpp | 2 +- addons/main/display3DEN/display3DEN.hpp | 10 +-- .../3DENShortcuts/fn_3DENShortcuts_init.sqf | 6 +- .../GUI/CFGS/fn_CFGS_changeFilter.sqf | 2 +- .../GUI/CFGS/fn_CFGS_handleFavorites.sqf | 2 +- .../functions/GUI/CFGS/fn_CFGS_playOrCopy.sqf | 4 +- .../main/functions/GUI/ESE/fn_ESE_export.sqf | 2 +- .../GUI/ESE/fn_ESE_getConfigValues.sqf | 4 +- .../GUI/ESE/fn_ESE_handleTemplates.sqf | 2 +- .../functions/GUI/RPTViewer/fn_RPTViewer.sqf | 2 +- addons/main/functions/GUI/SAM/fn_SAM.sqf | 6 +- .../fn_attributeSearch_onLoad.sqf | 2 +- .../GUI/briefingEditor/fn_briefingEditor.sqf | 4 +- .../fn_functionsViewer_getFunctionsData.sqf | 2 +- .../fn_functionsViewer_onTreeSelChanged.sqf | 2 +- .../fn_functionsViewer_setUpMenuStrip.sqf | 4 +- .../fn_functionsViewer_togglePanel.sqf | 8 +- .../fn_moduleInformation_onLoad.sqf | 2 +- .../GUI/placementTools/fn_placementTools.sqf | 4 +- .../fn_selectionFilter_init.sqf | 2 +- .../fn_textureFinder_fillList.sqf | 2 +- .../fn_textureFinder_findTextures.sqf | 2 +- .../fn_textureFinder_updatePreview.sqf | 4 +- .../attributes/fn_airDrop_onAttributeLoad.sqf | 2 +- .../fn_ambientFlyby_onAttributeLoad.sqf | 2 +- .../attributes/fn_debugOptions_init.sqf | 36 ++++----- .../fn_establishingShot_onAttributeLoad.sqf | 2 +- .../fn_groupMarker_onAttributeLoad.sqf | 4 +- .../attributes/fn_groupMarker_onLoad.sqf | 4 +- .../fn_introText_onAttributeLoad.sqf | 2 +- .../attributes/fn_slider_onAttributeSave.sqf | 2 +- .../functions/interface/fn_3DENMinimap.sqf | 12 +-- .../interface/fn_assetBrowser_collapse.sqf | 2 +- .../functions/interface/fn_favoritesList.sqf | 4 +- .../interface/fn_locationList_enhanced.sqf | 2 +- .../internal/fn_checkShortCutsDuplicates.sqf | 4 +- .../internal/fn_exportAttributesToGitHub.sqf | 2 +- .../internal/fn_exportContextMenuToGitHub.sqf | 2 +- .../internal/fn_exportMenuStripToGitHub.sqf | 2 +- addons/main/functions/log/fn_3DENLog.sqf | 2 +- .../functions/log/fn_exportGUIDefines.sqf | 2 +- .../main/functions/log/fn_exportLoadout.sqf | 4 +- addons/main/functions/misc/fn_VHCTools.sqf | 4 +- .../misc/fn_centerMapOnSelection.sqf | 2 +- .../misc/fn_createBackupMissionSQM.sqf | 4 +- addons/main/functions/misc/fn_getAllItems.sqf | 2 +- .../misc/fn_getConfigSourceAddon.sqf | 2 +- addons/main/functions/misc/fn_pylonTools.sqf | 6 +- addons/main/functions/misc/fn_switchTime.sqf | 8 +- addons/main/script_component.hpp | 4 +- include/a3/3den/ui/macros.inc | 4 +- include/a3/ui_f/hpp/definecommongrids.inc | 52 ++++++------- 56 files changed, 190 insertions(+), 171 deletions(-) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 779e99a3..f1964b20 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -35,8 +35,27 @@ workshop = [ ] mission = "3denEnhanced.VR" # Mission to launch directly into the editor with +executable = "arma3_x64" # parameters = [ # ] -executable = "arma3_x64" \ No newline at end of file +executable = "arma3_x64" +[lints.sqf.command_case] +severity = "Error" +options.ignore = [ + "AGLtoASL", + "ASLtoAGL", + "groupID" +] + +[lints.sqf.banned_commands] +options.banned = [ + "execVM", + "opfor", + "blufor", + "resistance", + "and", + "or", + "not" +] \ No newline at end of file diff --git a/addons/main/GUI/RscDebugConsole.hpp b/addons/main/GUI/RscDebugConsole.hpp index 8d731a10..40478b14 100644 --- a/addons/main/GUI/RscDebugConsole.hpp +++ b/addons/main/GUI/RscDebugConsole.hpp @@ -8,7 +8,7 @@ class RscDebugConsole: RscControlsGroupNoScrollbars { idc = -1; //Dynamically reposition it if Connor's functions viewer is available as well. - onLoad = "_this # 0 ctrlSetText ('ENH_' + localize 'STR_A3_RSCDEBUGCONSOLE_BUTTONFUNCTIONS'); if (isClass (configFile >> 'RscDisplayDebugPublic' >> 'Controls' >> 'DebugConsole' >> 'controls' >> 'CAU_xFuncViewer')) then {_this # 0 ctrlSetPosition [7.5 * (((safezoneW / safezoneH) min 1.2) / 40), 21.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)]; _this # 0 ctrlCommit 0;}"; + onLoad = "_this # 0 ctrlSetText ('ENH_' + localize 'STR_A3_RSCDEBUGCONSOLE_BUTTONFUNCTIONS'); if (isClass (configFile >> 'RscDisplayDebugPublic' >> 'Controls' >> 'DebugConsole' >> 'controls' >> 'CAU_xFuncViewer')) then {_this # 0 ctrlSetPosition [7.5 * (((safeZoneW / safeZoneH) min 1.2) / 40), 21.6 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)]; _this # 0 ctrlCommit 0;}"; x = QUOTE(7.5 * GUI_GRID_W); onButtonClick = "ctrlParent (_this # 0) createDisplay 'ENH_FunctionsViewer'"; }; diff --git a/addons/main/GUI/functionsViewer.hpp b/addons/main/GUI/functionsViewer.hpp index e7aae7bf..3f99f2f3 100644 --- a/addons/main/GUI/functionsViewer.hpp +++ b/addons/main/GUI/functionsViewer.hpp @@ -9,34 +9,34 @@ class ENH_FunctionsViewer class Header: ctrlStaticTitle { text = "$STR_ENH_MAIN_FUNCTIONSVIEWER_HEADER"; - x = QUOTE(safezoneX); - y = QUOTE(safezoneY); - w = QUOTE(safezoneW); + x = QUOTE(safeZoneX); + y = QUOTE(safeZoneY); + w = QUOTE(safeZoneW); h = QUOTE(CTRL_DEFAULT_H); colorBackground[] = {COLOR_ACTIVE_RGBA}; moving = 0; }; class Background: ctrlStaticBackground { - x = QUOTE(safezoneX); - y = QUOTE(safezoneY + CTRL_DEFAULT_H); - w = QUOTE(safezoneW); - h = QUOTE(safezoneH - CTRL_DEFAULT_H); + x = QUOTE(safeZoneX); + y = QUOTE(safeZoneY + CTRL_DEFAULT_H); + w = QUOTE(safeZoneW); + h = QUOTE(safeZoneH - CTRL_DEFAULT_H); }; class NumFunctions: ctrlStatic { idc = IDC_FUNCTIONSVIEWER_NUMFUNCTIONS; tooltip = "$STR_ENH_MAIN_FUNCTIONSVIEWER_NUMFUNCTIONS_TOOLTIP"; - x = QUOTE(safezoneX + GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(10 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; class Footer: ctrlStaticFooter { - x = QUOTE(safezoneX); - y = QUOTE(safezoneY + safezoneH - 7 * GRID_H); - w = QUOTE(safezoneW); + x = QUOTE(safeZoneX); + y = QUOTE(safeZoneY + safeZoneH - 7 * GRID_H); + w = QUOTE(safeZoneW); h = QUOTE(CTRL_DEFAULT_H + 2 * GRID_H); }; }; @@ -45,9 +45,9 @@ class ENH_FunctionsViewer class MenuStrip: ctrlMenuStrip { idc = IDC_FUNCTIONSVIEWER_MENU; - x = QUOTE(safezoneX); - y = QUOTE(safezoneY + CTRL_DEFAULT_H); - w = QUOTE(safezoneW); + x = QUOTE(safeZoneX); + y = QUOTE(safeZoneY + CTRL_DEFAULT_H); + w = QUOTE(safeZoneW); h = QUOTE(CTRL_DEFAULT_H); class Items { @@ -203,10 +203,10 @@ class ENH_FunctionsViewer { idc = IDC_FUNCTIONSVIEWER_LIST; idcSearch = 1400; - x = QUOTE(safezoneX + GRID_W); - y = QUOTE(safezoneY + 2 * CTRL_DEFAULT_H + GRID_H); + x = QUOTE(safeZoneX + GRID_W); + y = QUOTE(safeZoneY + 2 * CTRL_DEFAULT_H + GRID_H); w = QUOTE(SIDEBAR_W); - h = QUOTE(safezoneH - 3 * CTRL_DEFAULT_H - 3 * GRID_H); + h = QUOTE(safeZoneH - 3 * CTRL_DEFAULT_H - 3 * GRID_H); colorLines[] = {1, 1, 1, 1}; borderSize = 0; colorBorder[] = {0, 0, 0, 0}; @@ -215,16 +215,16 @@ class ENH_FunctionsViewer { idc = IDC_FUNCTIONSVIEWER_SEARCH; tooltip = __EVAL(format ["%1+%2", toUpper localize "STR_DIK_CONTROL", "F"]); - x = QUOTE(safezoneX + 12 * GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + 12 * GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(53 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; class ButtonSearch: ctrlButtonSearch { idc = IDC_FUNCTIONSVIEWER_BUTTONSEARCH; - x = QUOTE(safezoneX + 65 * GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + 65 * GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(5 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; @@ -233,8 +233,8 @@ class ENH_FunctionsViewer idc = IDC_FUNCTIONSVIEWER_NAME; tooltip = "$STR_ENH_MAIN_FUNCTIONSVIEWER_FUNCTIONNAME_TOOLTIP"; canModify = 0; - x = QUOTE(safezoneX + 72 * GRID_W); - y = QUOTE(safezoneY + 2 * CTRL_DEFAULT_H + GRID_H); + x = QUOTE(safeZoneX + 72 * GRID_W); + y = QUOTE(safeZoneY + 2 * CTRL_DEFAULT_H + GRID_H); w = QUOTE(70 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; @@ -242,15 +242,15 @@ class ENH_FunctionsViewer { idc = IDC_FUNCTIONSVIEWER_PATH; tooltip = "$STR_ENH_MAIN_FUNCTIONSVIEWER_FUNCTIONPATH_TOOLTIP"; - x = QUOTE(safezoneX + 143 * GRID_W); - w = QUOTE(safezoneW - (143 + 1) * GRID_W); + x = QUOTE(safeZoneX + 143 * GRID_W); + w = QUOTE(safeZoneW - (143 + 1) * GRID_W); }; class SearchCode: ctrlEdit { idc = IDC_FUNCTIONSVIEWER_SEARCHCODE; tooltip = __EVAL(toUpper format ["%1+%2+%3", localize "STR_DIK_CONTROL", localize "STR_VK_SHIFT", "F"]); - x = QUOTE(safezoneX + 72 * GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + 72 * GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(40 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); onKeyUp = "_this call ENH_fnc_functionsViewer_searchKey"; @@ -258,16 +258,16 @@ class ENH_FunctionsViewer class SearchText: ctrlStatic { idc = IDC_FUNCTIONSVIEWER_SEARCHTEXT; - x = QUOTE(safezoneX + 113 * GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + 113 * GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(30 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; class SearchButtonUp: ctrlButtonPictureKeepAspect { text = "\a3\ui_f\data\gui\rsc\rscdisplaymultiplayer\arrow_up_ca.paa"; - x = QUOTE(safezoneX + 135 * GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + 135 * GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(5 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); onButtonClick = "[_this # 0, -1] call ENH_fnc_FunctionsViewer_IncrementKey"; @@ -275,15 +275,15 @@ class ENH_FunctionsViewer class SearchButtonDown: SearchButtonUp { text = "\a3\ui_f\data\gui\rsc\rscdisplaymultiplayer\arrow_down_ca.paa"; - x = QUOTE(safezoneX + 129 * GRID_W); + x = QUOTE(safeZoneX + 129 * GRID_W); onButtonClick = "[_this # 0, 1] call ENH_fnc_functionsViewer_incrementKey"; }; class Preview: ctrlControlsGroup { idc = IDC_FUNCTIONSVIEWER_GROUP; - x = QUOTE(safezoneX + 72 * GRID_W); - y = QUOTE(safezoneY + 3 * CTRL_DEFAULT_H + 2 * GRID_H); - w = QUOTE(safezoneW - 73 * GRID_W); + x = QUOTE(safeZoneX + 72 * GRID_W); + y = QUOTE(safeZoneY + 3 * CTRL_DEFAULT_H + 2 * GRID_H); + w = QUOTE(safeZoneW - 73 * GRID_W); h = QUOTE(safeZoneH - 4 * CTRL_DEFAULT_H - 4 * GRID_H); class Controls { @@ -314,8 +314,8 @@ class ENH_FunctionsViewer }; class Close: ctrlButtonClose { - x = QUOTE(safezoneX + safezoneW - 26 * GRID_W); - y = QUOTE(safezoneY + safezoneH - 6 * GRID_H); + x = QUOTE(safeZoneX + safeZoneW - 26 * GRID_W); + y = QUOTE(safeZoneY + safeZoneH - 6 * GRID_H); w = QUOTE(25 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; diff --git a/addons/main/GUI/placementTools.hpp b/addons/main/GUI/placementTools.hpp index 9f9ed2fe..6800b781 100644 --- a/addons/main/GUI/placementTools.hpp +++ b/addons/main/GUI/placementTools.hpp @@ -9,7 +9,7 @@ class ENH_PlacementToolsGroup: ctrlControlsGroup idc = IDC_PLACEMENTTOOLS; onLoad = "[ctrlParent (_this#0), 'onLoad'] call ENH_fnc_placementTools"; onUnload = "[ctrlParent (_this#0), 'onUnload'] call ENH_fnc_placementTools"; - x = QUOTE(safezoneX + 2 * GRID_W); + x = QUOTE(safeZoneX + 2 * GRID_W); y = QUOTE(WINDOW_TOPAbs + 2 * CTRL_DEFAULT_H + 3 * GRID_H); w = QUOTE(58 * GRID_W); h = QUOTE(WINDOW_HAbs - 5 * CTRL_DEFAULT_H); diff --git a/addons/main/attributesMission/establishingShot.hpp b/addons/main/attributesMission/establishingShot.hpp index 3c9ba092..e7f718e2 100644 --- a/addons/main/attributesMission/establishingShot.hpp +++ b/addons/main/attributesMission/establishingShot.hpp @@ -16,7 +16,7 @@ class ENH_EstablishingShot property = "ENH_establisingShot"; control = "ENH_EstablishingShot"; expression = "if (!is3DEN && !((_value # 0) isEqualTo [0, 0, 0]) && hasInterface) then {_value spawn BIS_fnc_establishingShot}"; - defaultValue = "[[0, 0, 0], getText (configfile >> 'CfgWorlds' >> worldName >> 'description'), 500, 200, 60, 0]"; + defaultValue = "[[0, 0, 0], getText (configFile >> 'CfgWorlds' >> worldName >> 'description'), 500, 200, 60, 0]"; }; }; }; \ No newline at end of file diff --git a/addons/main/display3DEN/display3DEN.hpp b/addons/main/display3DEN/display3DEN.hpp index 9703c54e..a790dee4 100644 --- a/addons/main/display3DEN/display3DEN.hpp +++ b/addons/main/display3DEN/display3DEN.hpp @@ -187,7 +187,7 @@ class Display3DEN { class ENH_Footer: ctrlStaticFooter { - y = QUOTE(safezoneH - (28 + 7) * GRID_H); + y = QUOTE(safeZoneH - (28 + 7) * GRID_H); w = QUOTE(60 * GRID_W); h = QUOTE(7 * GRID_H); }; @@ -230,7 +230,7 @@ class Display3DEN x = QUOTE(0); y = QUOTE(7 * GRID_H); w = QUOTE(60 * GRID_W); - h = QUOTE(safezoneH - (28 + 21) * GRID_H); + h = QUOTE(safeZoneH - (28 + 21) * GRID_H); borderSize = 0; colorBorder[] = {0, 0, 0, 0}; multiselectEnabled = 1; @@ -240,7 +240,7 @@ class Display3DEN idc = IDC_DISPLAY3DEN_FAVORITES_BUTTON_DELETE; text = "$STR_DISP_DELETE"; x = QUOTE(GRID_W); - y = QUOTE(safezoneH - (28 + 6) * GRID_H); + y = QUOTE(safeZoneH - (28 + 6) * GRID_H); w = QUOTE(58 * GRID_W); h = QUOTE(CTRL_DEFAULT_H); }; @@ -297,7 +297,7 @@ class Display3DEN x = QUOTE(0); y = QUOTE(7 * GRID_H); w = QUOTE(60 * GRID_W); - h = QUOTE(safezoneH - 35 * GRID_H); + h = QUOTE(safeZoneH - 35 * GRID_H); onTreeDblClick = "['select', _this] call bis_fnc_3DENListLocations; ['view'] call ENH_fnc_locationList_enhanced"; disableKeyboardSearch = 1; expandOnDoubleclick = 0; @@ -305,7 +305,7 @@ class Display3DEN }; class EditPanel: ctrlControlsGroupNoScrollbars { - y = QUOTE(safezoneH - 29 * GRID_H); + y = QUOTE(safeZoneH - 29 * GRID_H); w = QUOTE(60 * GRID_W); h = QUOTE(7 * GRID_H); class Controls diff --git a/addons/main/functions/GUI/3DENShortcuts/fn_3DENShortcuts_init.sqf b/addons/main/functions/GUI/3DENShortcuts/fn_3DENShortcuts_init.sqf index 1fd5adc8..7b2935d5 100644 --- a/addons/main/functions/GUI/3DENShortcuts/fn_3DENShortcuts_init.sqf +++ b/addons/main/functions/GUI/3DENShortcuts/fn_3DENShortcuts_init.sqf @@ -17,15 +17,15 @@ _ctrlFilter lnbAddRow ["", localize "STR_ENH_MAIN_TOOLS_3DENSHORTCUTS_ACTION", l _ctrlButtonSearch ctrlAddEventHandler ["ButtonClick", { params ["_ctrlButton"]; - ctrlparent _ctrlButton displayCtrl IDC_SHORTCUTS_SEARCH ctrlSetText ""; + ctrlParent _ctrlButton displayCtrl IDC_SHORTCUTS_SEARCH ctrlSetText ""; _ctrlButton ctrlSetText TEXTURE_SEARCH_START; }]; _ctrlSearch ctrlAddEventHandler ["EditChanged", { params ["_ctrlSearch", "_newText"]; - ctrlparent _ctrlSearch displayCtrl IDC_SHORTCUTS_BUTTONSEARCH ctrlSetText TEXTURE_SEARCH_END; - [ctrlparent _ctrlSearch displayCtrl IDC_SHORTCUTS_CONTENT, _newText] call ENH_fnc_3DENShortcuts_fillList; + ctrlParent _ctrlSearch displayCtrl IDC_SHORTCUTS_BUTTONSEARCH ctrlSetText TEXTURE_SEARCH_END; + [ctrlParent _ctrlSearch displayCtrl IDC_SHORTCUTS_CONTENT, _newText] call ENH_fnc_3DENShortcuts_fillList; }]; //Focus search so user can search right away diff --git a/addons/main/functions/GUI/CFGS/fn_CFGS_changeFilter.sqf b/addons/main/functions/GUI/CFGS/fn_CFGS_changeFilter.sqf index a263bfe5..1a4ab84e 100644 --- a/addons/main/functions/GUI/CFGS/fn_CFGS_changeFilter.sqf +++ b/addons/main/functions/GUI/CFGS/fn_CFGS_changeFilter.sqf @@ -19,4 +19,4 @@ params ["_ctrlFilter", "_selectedIndex"]; [_ctrlFilter lbData _selectedIndex] call ENH_fnc_CFGS_getCfgSentences; -(ctrlparent _ctrlFilter) displayCtrl IDC_SENTENCESBROWSER_SEARCH ctrlSetText ""; \ No newline at end of file +(ctrlParent _ctrlFilter) displayCtrl IDC_SENTENCESBROWSER_SEARCH ctrlSetText ""; \ No newline at end of file diff --git a/addons/main/functions/GUI/CFGS/fn_CFGS_handleFavorites.sqf b/addons/main/functions/GUI/CFGS/fn_CFGS_handleFavorites.sqf index 34b80b4f..23bd0474 100644 --- a/addons/main/functions/GUI/CFGS/fn_CFGS_handleFavorites.sqf +++ b/addons/main/functions/GUI/CFGS/fn_CFGS_handleFavorites.sqf @@ -48,7 +48,7 @@ else { private _ctrlHighlight = [((_this select 0) displayCtrl 1000), 5] call BIS_fnc_highlightControl; sleep 2; - ctrldelete _ctrlHighlight; + ctrlDelete _ctrlHighlight; }; } else diff --git a/addons/main/functions/GUI/CFGS/fn_CFGS_playOrCopy.sqf b/addons/main/functions/GUI/CFGS/fn_CFGS_playOrCopy.sqf index 8f14da65..a98e08ee 100644 --- a/addons/main/functions/GUI/CFGS/fn_CFGS_playOrCopy.sqf +++ b/addons/main/functions/GUI/CFGS/fn_CFGS_playOrCopy.sqf @@ -38,6 +38,6 @@ else _data = (str _data) + endl + endl + "Example:" + endl + endl + format ["playSound3D ['%1', player];", _data select 4] + endl + endl + "[['SPEAKER', " + str _text + ", 0]] " + "spawn BIS_fnc_EXP_camp_playSubtitles;"; - uinamespace setVariable ["Display3DENCopy_data", ["", _data]]; - (uiNamespace getVariable "ENH_CFGS_Display") createdisplay "Display3DENCopy"; + uiNamespace setVariable ["Display3DENCopy_data", ["", _data]]; + (uiNamespace getVariable "ENH_CFGS_Display") createDisplay "Display3DENCopy"; }; \ No newline at end of file diff --git a/addons/main/functions/GUI/ESE/fn_ESE_export.sqf b/addons/main/functions/GUI/ESE/fn_ESE_export.sqf index e7160be7..ba4f27ba 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_export.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_export.sqf @@ -58,7 +58,7 @@ switch (_mode) do _export = _export regexReplace ["(,)([^ ])", "$1 $2"]; _export = trim _export; -uinamespace setVariable ["display3DENCopy_data", ["Export to Arsenal (LOCALIZE)", _export]]; +uiNamespace setVariable ["display3DENCopy_data", ["Export to Arsenal (LOCALIZE)", _export]]; (uiNamespace getVariable ["ENH_Display_ESE", displayNull]) createDisplay "display3denCopy"; nil \ No newline at end of file diff --git a/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf b/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf index d2197afb..9ef15a5f 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf @@ -52,7 +52,7 @@ if (count _input > 0) then { _category, _specificType, getText (_x >> "descriptionShort") regexReplace ["", "\n"], - _class //Properly cased configname for displaying + _class //Properly cased configName for displaying ] ] ] @@ -60,4 +60,4 @@ if (count _input > 0) then { } }; -[TYPES_WHITELIST, _itemsHashMap, _addons] +[TYPES_WHITELIST, _itemsHashMap, _addons] \ No newline at end of file diff --git a/addons/main/functions/GUI/ESE/fn_ESE_handleTemplates.sqf b/addons/main/functions/GUI/ESE/fn_ESE_handleTemplates.sqf index 78ddcab5..ea645224 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_handleTemplates.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_handleTemplates.sqf @@ -60,6 +60,6 @@ switch (_mode) do { _x params ["_name", "_description", "_data", ["_date", systemTime]]; [_lbTemplates, _name, _data, "", "", _description, [_date] call ENH_fnc_systemTimeFormatted] call ENH_fnc_ESE_lbAdd; - } foreach (profileNamespace getVariable ["ENH_VIM_Templates", []]); + } forEach (profileNamespace getVariable ["ENH_VIM_Templates", []]); }; }; \ No newline at end of file diff --git a/addons/main/functions/GUI/RPTViewer/fn_RPTViewer.sqf b/addons/main/functions/GUI/RPTViewer/fn_RPTViewer.sqf index ad28c59f..a0b98d66 100644 --- a/addons/main/functions/GUI/RPTViewer/fn_RPTViewer.sqf +++ b/addons/main/functions/GUI/RPTViewer/fn_RPTViewer.sqf @@ -16,7 +16,7 @@ #include "\x\enh\addons\main\script_component.hpp" #define LINES (uiNamespace getVariable ["ENH_RPTViewer_Lines", 100]) -if !(isClass (configfile >> "CfgPatches" >> "PY3_Pythia")) exitWith +if !(isClass (configFile >> "CfgPatches" >> "PY3_Pythia")) exitWith { ["ENH_GetPythiaMod_Warning", 1, 10] call BIS_fnc_3DENNotification; }; diff --git a/addons/main/functions/GUI/SAM/fn_SAM.sqf b/addons/main/functions/GUI/SAM/fn_SAM.sqf index 8a40ccc3..9c17e04d 100644 --- a/addons/main/functions/GUI/SAM/fn_SAM.sqf +++ b/addons/main/functions/GUI/SAM/fn_SAM.sqf @@ -201,16 +201,16 @@ switch _mode do //Store templates in profilenamespace and save it. profileNamespace setVariable ["ENH_SAM_Templates", _templates]; - saveprofileNamespace; + saveProfileNamespace; }; case "getScenarioAttributes": { private _attributeValues = []; - private _sections = [configfile >> "Cfg3DEN" >> "Mission", 0, false] call BIS_fnc_returnChildren; + private _sections = [configFile >> "Cfg3DEN" >> "Mission", 0, false] call BIS_fnc_returnChildren; { private _section = configName _x; - private _children = [configfile >> "Cfg3DEN" >> "Mission" >> _section >> "AttributeCategories", 2, false] call BIS_fnc_returnChildren; + private _children = [configFile >> "Cfg3DEN" >> "Mission" >> _section >> "AttributeCategories", 2, false] call BIS_fnc_returnChildren; { private _attributeDisplayName = getText (_x >> "displayName"); private _attributeName = getText (_x >> "property");//By default get _attributeValue by propertyName diff --git a/addons/main/functions/GUI/attributeSearch/fn_attributeSearch_onLoad.sqf b/addons/main/functions/GUI/attributeSearch/fn_attributeSearch_onLoad.sqf index f43e07b2..3ab1db22 100644 --- a/addons/main/functions/GUI/attributeSearch/fn_attributeSearch_onLoad.sqf +++ b/addons/main/functions/GUI/attributeSearch/fn_attributeSearch_onLoad.sqf @@ -165,7 +165,7 @@ _ctrlTV ctrlAddEventHandler ["TreeSelChanged", case (_entity in _markers): { if (get3DENActionState "toggleMap" != 1) then {do3DENAction "toggleMap"}; - private _ctrlmap = findDisplay 313 displayctrl 51; + private _ctrlmap = findDisplay 313 displayCtrl 51; _pos = ATT(_entity,"position"); _ctrlmap ctrlMapAnimAdd [0, ctrlMapScale _ctrlmap, _pos]; diff --git a/addons/main/functions/GUI/briefingEditor/fn_briefingEditor.sqf b/addons/main/functions/GUI/briefingEditor/fn_briefingEditor.sqf index 914362fc..14e3724f 100644 --- a/addons/main/functions/GUI/briefingEditor/fn_briefingEditor.sqf +++ b/addons/main/functions/GUI/briefingEditor/fn_briefingEditor.sqf @@ -219,7 +219,7 @@ switch _mode do //Get icon private _markerType = (_x get3DENAttribute "itemClass") # 0; - private _icon = getText (configfile >> "CfgMarkers" >> _markerType >> "icon"); + private _icon = getText (configFile >> "CfgMarkers" >> _markerType >> "icon"); //Get colour private _markerColor = (_x get3DENAttribute "baseColor") # 0; @@ -228,7 +228,7 @@ switch _mode do if (_markerColor isEqualTo "Default") then { - _color = getArray (configfile >> "CfgMarkers" >> _markerType >> "color"); + _color = getArray (configFile >> "CfgMarkers" >> _markerType >> "color"); if (count _color == 4) then {_color = _color call BIS_fnc_colorConfigToRGBA} else {_color = [1, 1, 1, 1]}; if (_color isEqualTo [0, 0, 0, 1]) then {_color = [1, 1, 1, 1]}; }; diff --git a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_getFunctionsData.sqf b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_getFunctionsData.sqf index a8b000d3..4c57001e 100644 --- a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_getFunctionsData.sqf +++ b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_getFunctionsData.sqf @@ -63,6 +63,6 @@ private _functionsData = []; } forEach ("true" configClasses (_config >> "CfgFunctions" >> _addon >> _category)); } forEach ("true" configClasses (_config >> "CfgFunctions" >> _addon)); } forEach ("true" configClasses (_config >> "CfgFunctions")); -} forEach [[configFile, "configFile"], [missionConfigFile, "missionConfigFile"], [campaignConfigfile, "campaignConfigFile"]]; +} forEach [[configFile, "configFile"], [missionConfigFile, "missionConfigFile"], [campaignConfigFile, "campaignConfigFile"]]; _functionsData \ No newline at end of file diff --git a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_onTreeSelChanged.sqf b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_onTreeSelChanged.sqf index 45f50adb..a6b8789b 100644 --- a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_onTreeSelChanged.sqf +++ b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_onTreeSelChanged.sqf @@ -15,7 +15,7 @@ #include "\x\enh\addons\main\script_component.hpp" disableSerialization; -forceunicode 0; +forceUnicode 0; private _display = uiNamespace getVariable ["ENH_Display_FunctionsViewer", displayNull]; diff --git a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_setUpMenuStrip.sqf b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_setUpMenuStrip.sqf index b10202ac..9517722d 100644 --- a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_setUpMenuStrip.sqf +++ b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_setUpMenuStrip.sqf @@ -47,8 +47,8 @@ _ctrlMenu menuSetCheck [[0, 11], _loadFileIndex == 2]; //Disable entries that are not available _ctrlMenu menuEnable [[0, 2], isClass (campaignConfigFile >> "CfgFunction")]; -_ctrlMenu menuEnable [[1, 4], getNumber (missionConfigfile >> "allowFunctionsRecompile") > 0 || is3DEN || is3DENPreview]; -_ctrlMenu menuEnable [[1, 5], getNumber (missionConfigfile >> "allowFunctionsRecompile") > 0 || is3DEN || is3DENPreview]; +_ctrlMenu menuEnable [[1, 4], getNumber (missionConfigFile >> "allowFunctionsRecompile") > 0 || is3DEN || is3DENPreview]; +_ctrlMenu menuEnable [[1, 5], getNumber (missionConfigFile >> "allowFunctionsRecompile") > 0 || is3DEN || is3DENPreview]; //If we load other files then sorting has no effect _ctrlMenu menuEnable [[0, 5], !_showOtherFiles]; diff --git a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_togglePanel.sqf b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_togglePanel.sqf index 27eb0da3..b7c3be0a 100644 --- a/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_togglePanel.sqf +++ b/addons/main/functions/GUI/functionsViewer/fn_functionsViewer_togglePanel.sqf @@ -15,8 +15,8 @@ #include "\x\enh\addons\main\script_component.hpp" #define SIDEBAR_W 70 * GRID_W -#define LEFT (safezoneX + GRID_W) -#define Y (safezoneY + 3 * CTRL_DEFAULT_H + 2 * GRID_H) +#define LEFT (safeZoneX + GRID_W) +#define Y (safeZoneY + 3 * CTRL_DEFAULT_H + 2 * GRID_H) #define H (safeZoneH - 4 * CTRL_DEFAULT_H - 4 * GRID_H) disableSerialization; @@ -25,11 +25,11 @@ private _state = _display getVariable ["SideBarCollapsed", false]; if !(_state) then { - CTRL(IDC_FUNCTIONSVIEWER_GROUP) ctrlSetPosition [LEFT, Y, safezoneW - 73 * GRID_W + SIDEBAR_W + GRID_W, H]; + CTRL(IDC_FUNCTIONSVIEWER_GROUP) ctrlSetPosition [LEFT, Y, safeZoneW - 73 * GRID_W + SIDEBAR_W + GRID_W, H]; } else { - CTRL(IDC_FUNCTIONSVIEWER_GROUP) ctrlSetPosition [LEFT + SIDEBAR_W + GRID_W, Y, safezoneW - 73 * GRID_W, H]; + CTRL(IDC_FUNCTIONSVIEWER_GROUP) ctrlSetPosition [LEFT + SIDEBAR_W + GRID_W, Y, safeZoneW - 73 * GRID_W, H]; }; CTRL(IDC_FUNCTIONSVIEWER_LIST) ctrlShow _state; diff --git a/addons/main/functions/GUI/moduleInformation/fn_moduleInformation_onLoad.sqf b/addons/main/functions/GUI/moduleInformation/fn_moduleInformation_onLoad.sqf index 0e7aa582..5328d25b 100644 --- a/addons/main/functions/GUI/moduleInformation/fn_moduleInformation_onLoad.sqf +++ b/addons/main/functions/GUI/moduleInformation/fn_moduleInformation_onLoad.sqf @@ -78,7 +78,7 @@ _description = "" + localize "STR_ENH_MAIN_MODULEI localize "STR_ENH_MAIN_MODULEINFORMATION_DIRECTION", _direction ]; -if (_sync isNotEqualto []) then +if (_sync isNotEqualTo []) then { _description = _description + format ["%1%2%1", LB, localize "STR_ENH_MAIN_MODULEINFORMATION_SYNC"]; { diff --git a/addons/main/functions/GUI/placementTools/fn_placementTools.sqf b/addons/main/functions/GUI/placementTools/fn_placementTools.sqf index 8cdf9299..3b21432e 100644 --- a/addons/main/functions/GUI/placementTools/fn_placementTools.sqf +++ b/addons/main/functions/GUI/placementTools/fn_placementTools.sqf @@ -73,7 +73,7 @@ switch _mode do if (isNil "ENH_PlacementTools_Settings") then { - ENH_PlacementTools_Settings = createHashmapFromArray + ENH_PlacementTools_Settings = createHashMapFromArray [ ["Radius", 50], ["InitialAngle", 0], @@ -248,7 +248,7 @@ switch _mode do _ctrlEdit ctrlSetText str (_numericValue + _modifier); }]; - _x ctrlSetToolTip "PAGE UP/DOWN: +-1\nPAGE UP/DOWN + CTRL: +-0.1\nPAGE UP/DOWN + CTRL + ALT: +-0.01\nPAGE UP/DOWN + CTRL + ALT + SHIFT: +-0.001"; + _x ctrlSetTooltip "PAGE UP/DOWN: +-1\nPAGE UP/DOWN + CTRL: +-0.1\nPAGE UP/DOWN + CTRL + ALT: +-0.01\nPAGE UP/DOWN + CTRL + ALT + SHIFT: +-0.001"; } forEach (allControls _display select {ctrlType _x == 2}); }; case "onUnload": diff --git a/addons/main/functions/GUI/selectionFilter/fn_selectionFilter_init.sqf b/addons/main/functions/GUI/selectionFilter/fn_selectionFilter_init.sqf index 05a4aba6..c46e0532 100644 --- a/addons/main/functions/GUI/selectionFilter/fn_selectionFilter_init.sqf +++ b/addons/main/functions/GUI/selectionFilter/fn_selectionFilter_init.sqf @@ -84,7 +84,7 @@ ENH_fnc_selectionFilter_onCheckedChanged = _cb ctrlSetFade ([0.5, 0] select (cbChecked _cb)); _cb ctrlCommit 0; - (ctrlparent _cb) call ENH_fnc_selectionFilter_updateSelection; + (ctrlParent _cb) call ENH_fnc_selectionFilter_updateSelection; }; ENH_fnc_selectionFilter_editAttributes = diff --git a/addons/main/functions/GUI/textureFinder/fn_textureFinder_fillList.sqf b/addons/main/functions/GUI/textureFinder/fn_textureFinder_fillList.sqf index 113eb5d9..18c1ffe2 100644 --- a/addons/main/functions/GUI/textureFinder/fn_textureFinder_fillList.sqf +++ b/addons/main/functions/GUI/textureFinder/fn_textureFinder_fillList.sqf @@ -49,7 +49,7 @@ _ctrlTV tvAdd [[], "PAA"]; getTextureInfo _x params ["_w", "_h", "_rgb"]; _pixelCount = _w * _h; - _indexSize = SIZES findif {_pixelCount >= _x # 0 && _pixelCount <= _x # 1}; + _indexSize = SIZES findIf {_pixelCount >= _x # 0 && _pixelCount <= _x # 1}; _indexType = parseNumber (".paa" in _x); _indexItem = _ctrlTV tvAdd [[_indexType, _indexSize], format ["%1 [%2x%3]", _x, _w, _h]]; diff --git a/addons/main/functions/GUI/textureFinder/fn_textureFinder_findTextures.sqf b/addons/main/functions/GUI/textureFinder/fn_textureFinder_findTextures.sqf index c5722c49..1ba84772 100644 --- a/addons/main/functions/GUI/textureFinder/fn_textureFinder_findTextures.sqf +++ b/addons/main/functions/GUI/textureFinder/fn_textureFinder_findTextures.sqf @@ -65,7 +65,7 @@ CTRL(IDC_TEXTUREFINDER_TEXTURELIST) ctrlAddEventHandler ["KeyDown", if (_key isEqualTo 46 && _ctrl) then { - private _path = _ctrlTV tvdata (tvCurSel _ctrlTV); + private _path = _ctrlTV tvData (tvCurSel _ctrlTV); if (_path isEqualTo "") exitWith {}; copyToClipboard str _path; ["ENH_DataCopied"] call BIS_fnc_3DENNotification; diff --git a/addons/main/functions/GUI/textureFinder/fn_textureFinder_updatePreview.sqf b/addons/main/functions/GUI/textureFinder/fn_textureFinder_updatePreview.sqf index c520777c..10bb13c7 100644 --- a/addons/main/functions/GUI/textureFinder/fn_textureFinder_updatePreview.sqf +++ b/addons/main/functions/GUI/textureFinder/fn_textureFinder_updatePreview.sqf @@ -21,8 +21,8 @@ params ["_ctrlTV", "_path"]; //Exit if category or nothing is selected if (count _path < 3) exitWith {}; -private _ctrlTexturePreview = ctrlparent _ctrlTV displayCtrl IDC_TEXTUREFINDER_PREVIEW; -private _ctrlTexturePreviewBG = ctrlparent _ctrlTV displayCtrl IDC_TEXTUREFINDER_PREVIEWBACKGROUND; +private _ctrlTexturePreview = ctrlParent _ctrlTV displayCtrl IDC_TEXTUREFINDER_PREVIEW; +private _ctrlTexturePreviewBG = ctrlParent _ctrlTV displayCtrl IDC_TEXTUREFINDER_PREVIEWBACKGROUND; private _texture = _ctrlTV tvData _path; diff --git a/addons/main/functions/attributes/fn_airDrop_onAttributeLoad.sqf b/addons/main/functions/attributes/fn_airDrop_onAttributeLoad.sqf index c5f6ab45..0f55f1d3 100644 --- a/addons/main/functions/attributes/fn_airDrop_onAttributeLoad.sqf +++ b/addons/main/functions/attributes/fn_airDrop_onAttributeLoad.sqf @@ -29,7 +29,7 @@ else { private _add = if (_forEachIndex == 0) then {_x} else {format [", %1", _x]}; _valueClasses= _valueClasses + _add; - } foreach _classes; + } forEach _classes; (_ctrlGroup controlsGroupCtrl 100) ctrlSetText _valueClasses; }; diff --git a/addons/main/functions/attributes/fn_ambientFlyby_onAttributeLoad.sqf b/addons/main/functions/attributes/fn_ambientFlyby_onAttributeLoad.sqf index 10d32d9b..d082c065 100644 --- a/addons/main/functions/attributes/fn_ambientFlyby_onAttributeLoad.sqf +++ b/addons/main/functions/attributes/fn_ambientFlyby_onAttributeLoad.sqf @@ -29,7 +29,7 @@ else { private _add = if (_forEachIndex == 0) then {_x} else {format [", %1", _x]}; _valueClasses= _valueClasses + _add; - } foreach _classes; + } forEach _classes; (_ctrlGroup controlsGroupCtrl 100) ctrlSetText _valueClasses; }; diff --git a/addons/main/functions/attributes/fn_debugOptions_init.sqf b/addons/main/functions/attributes/fn_debugOptions_init.sqf index eb71b6be..ef26c8c9 100644 --- a/addons/main/functions/attributes/fn_debugOptions_init.sqf +++ b/addons/main/functions/attributes/fn_debugOptions_init.sqf @@ -78,19 +78,19 @@ if GETVALUE("Zeus") then { 0 spawn { - private _zeusModule = (creategroup sideLogic) createUnit ["ModuleCurator_F", [0, 0, 0], [], 10, "NONE"]; + private _zeusModule = (createGroup sideLogic) createUnit ["ModuleCurator_F", [0, 0, 0], [], 10, "NONE"]; player assignCurator _zeusModule; //Add Interface EHs (Workaround) _zeusModule addCuratorEditableObjects [entities "", true]; - _zeusModule addeventhandler ["curatorFeedbackMessage", {_this call BIS_fnc_showCuratorFeedbackMessage;}]; - _zeusModule addeventhandler ["curatorPinged", {_this call BIS_fnc_curatorPinged;}]; - _zeusModule addeventhandler ["curatorObjectPlaced", {_this call BIS_fnc_curatorObjectPlaced;}]; - _zeusModule addeventhandler ["curatorObjectEdited", {_this call BIS_fnc_curatorObjectEdited;}]; - _zeusModule addeventhandler ["curatorWaypointPlaced", {_this call BIS_fnc_curatorWaypointPlaced;}]; - _zeusModule addeventhandler ["curatorObjectDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; - _zeusModule addeventhandler ["curatorGroupDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; - _zeusModule addeventhandler ["curatorWaypointDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; - _zeusModule addeventhandler ["curatorMarkerDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; + _zeusModule addEventHandler ["CuratorFeedbackMessage", {_this call BIS_fnc_showCuratorFeedbackMessage;}]; + _zeusModule addEventHandler ["CuratorPinged", {_this call BIS_fnc_curatorPinged;}]; + _zeusModule addEventHandler ["CuratorObjectPlaced", {_this call BIS_fnc_curatorObjectPlaced;}]; + _zeusModule addEventHandler ["CuratorObjectEdited", {_this call BIS_fnc_curatorObjectEdited;}]; + _zeusModule addEventHandler ["CuratorWaypointPlaced", {_this call BIS_fnc_curatorWaypointPlaced;}]; + _zeusModule addEventHandler ["CuratorObjectDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; + _zeusModule addEventHandler ["CuratorGroupDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; + _zeusModule addEventHandler ["CuratorWaypointDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; + _zeusModule addEventHandler ["CuratorMarkerDoubleClicked", {(_this select 1) call BIS_fnc_showCuratorAttributes;}]; }; }; @@ -130,10 +130,10 @@ if GETVALUE("FPS") then private _ctrlFPS = MISSIONDISPLAY ctrlCreate ["RscStructuredText", 992]; _ctrlFPS ctrlSetPosition [ - 0.94625 * safezoneW + safezoneX, - 0.962 * safezoneH + safezoneY, - 0.0525 * safezoneW, - 0.056 * safezoneH + 0.94625 * safeZoneW + safeZoneX, + 0.962 * safeZoneH + safeZoneY, + 0.0525 * safeZoneW, + 0.056 * safeZoneH ]; _ctrlFPS ctrlCommit 0; }; @@ -141,11 +141,11 @@ if GETVALUE("FPS") then while {true} do { - _ctrlFPS ctrlSetStructuredText parsetext format + _ctrlFPS ctrlSetStructuredText parseText format [ "FPS(avg.): %1
FPS(min.): %2", round diag_fps, - round diag_fpsmin + round diag_fpsMin ]; sleep DELAY; }; @@ -566,7 +566,7 @@ if GETVALUE("ActiveScripts") then _export = _export + _fileName + " - "; _export = _export + str _isRunning + " - "; _export = _export + str _currentLine + endl; - } foreach diag_activeSQFScripts; + } forEach diag_activeSQFScripts; _export = _export + "---------------------------------------------------ACTIVE FSMs----------------------------------------------------" + endl; @@ -575,7 +575,7 @@ if GETVALUE("ActiveScripts") then _export = _export + _scriptName + " - "; _export = _export + _state + " - "; _export = _export + str _timeOut + endl; - } foreach diag_activeMissionFSMs; + } forEach diag_activeMissionFSMs; _export = _export + "-----------------------------------------------ACTIVE MISSION EHs-------------------------------------------------" + endl; diff --git a/addons/main/functions/attributes/fn_establishingShot_onAttributeLoad.sqf b/addons/main/functions/attributes/fn_establishingShot_onAttributeLoad.sqf index 8af27465..200e45e9 100644 --- a/addons/main/functions/attributes/fn_establishingShot_onAttributeLoad.sqf +++ b/addons/main/functions/attributes/fn_establishingShot_onAttributeLoad.sqf @@ -37,7 +37,7 @@ _value params ["_center", "_text", "_alt", "_r", "_angle", "_dir"]; private _ctrlGroup = ctrlParentControlsGroup (_this select 0); (_ctrlGroup controlsGroupCtrl 100) ctrlSetText "[0, 0, 0]"; - (_ctrlGroup controlsGroupCtrl 101) ctrlSetText (getText (configfile >> 'CfgWorlds' >> worldName >> 'description')); + (_ctrlGroup controlsGroupCtrl 101) ctrlSetText (getText (configFile >> 'CfgWorlds' >> worldName >> 'description')); [_ctrlGroup controlsGroupCtrl 102, _ctrlGroup controlsGroupCtrl 103, "m", 500] call BIS_fnc_initSliderValue; [_ctrlGroup controlsGroupCtrl 104, _ctrlGroup controlsGroupCtrl 105, "m", 200] call BIS_fnc_initSliderValue; diff --git a/addons/main/functions/attributes/fn_groupMarker_onAttributeLoad.sqf b/addons/main/functions/attributes/fn_groupMarker_onAttributeLoad.sqf index d5530b91..5f635906 100644 --- a/addons/main/functions/attributes/fn_groupMarker_onAttributeLoad.sqf +++ b/addons/main/functions/attributes/fn_groupMarker_onAttributeLoad.sqf @@ -54,7 +54,7 @@ _ctrlCheckbox2 cbSetChecked _showGroupVehicle; //Fill marker color combo { private _color = (_x >> "color") call bis_fnc_colorConfigToRGBA; - private _class = configname _x; + private _class = configName _x; private _i = _ctrlComboColor lbAdd getText (_x >> "name"); _ctrlComboColor lbSetData [_i, _class]; _ctrlComboColor lbSetPicture [_i, "#(argb,8,8,3)color(1,1,1,1)"]; @@ -65,7 +65,7 @@ _ctrlCheckbox2 cbSetChecked _showGroupVehicle; { _ctrlComboColor lbSetCurSel _i; }; -} foreach configproperties [configfile >> "CfgMarkerColors", "isClass _x && getNumber (_x >> 'scope') > 0"]; +} forEach configProperties [configFile >> "CfgMarkerColors", "isClass _x && getNumber (_x >> 'scope') > 0"]; //Add reset event to reset button (_ctrlGroup controlsGroupCtrl 5) ctrlAddEventHandler ["ButtonClick", diff --git a/addons/main/functions/attributes/fn_groupMarker_onLoad.sqf b/addons/main/functions/attributes/fn_groupMarker_onLoad.sqf index 5a2e21d1..34eac729 100644 --- a/addons/main/functions/attributes/fn_groupMarker_onLoad.sqf +++ b/addons/main/functions/attributes/fn_groupMarker_onLoad.sqf @@ -48,14 +48,14 @@ _markers insert [0, [[localize "STR_DISABLED", "", "", [1, 1, 1, 1]]]]; //Fill marker color combo { private _color = (_x >> "color") call bis_fnc_colorConfigToRGBA; - private _class = configname _x; + private _class = configName _x; private _i = _ctrlComboColor lbAdd getText (_x >> "name"); _ctrlComboColor lbSetData [_i, _class]; _ctrlComboColor lbSetPicture [_i, "#(argb,8,8,3)color(1,1,1,1)"]; _ctrlComboColor lbSetPictureColor [_i, _color]; _ctrlComboColor lbSetPictureColorSelected [_i, _color]; _ctrlComboColor lbSetTooltip [_i, _ctrlComboColor lbData _i]; -} foreach ("getNumber (_x >> 'scope') > 0" configClasses (configFile >> "CfgMarkerColors")); +} forEach ("getNumber (_x >> 'scope') > 0" configClasses (configFile >> "CfgMarkerColors")); //Add reset event to reset button (_ctrlGroup controlsGroupCtrl 5) ctrlAddEventHandler ["ButtonClick", diff --git a/addons/main/functions/attributes/fn_introText_onAttributeLoad.sqf b/addons/main/functions/attributes/fn_introText_onAttributeLoad.sqf index e36fce2c..075655b5 100644 --- a/addons/main/functions/attributes/fn_introText_onAttributeLoad.sqf +++ b/addons/main/functions/attributes/fn_introText_onAttributeLoad.sqf @@ -34,6 +34,6 @@ _value params ["_delay", "_line1", "_line2", "_line3", "_introType"]; [_ctrlGroup controlsGroupCtrl 100, _ctrlGroup controlsGroupCtrl 101, "s", 0] call BIS_fnc_initSliderValue; (_ctrlGroup controlsGroupCtrl 102) ctrlSetText briefingName; (_ctrlGroup controlsGroupCtrl 103) ctrlSetText ('by ' + profileName); - (_ctrlGroup controlsGroupCtrl 104) ctrlSetText ([daytime, 'HH:MM'] call BIS_fnc_TimeToString); + (_ctrlGroup controlsGroupCtrl 104) ctrlSetText ([dayTime, 'HH:MM'] call BIS_fnc_TimeToString); (_ctrlGroup controlsGroupCtrl 105) lbSetCurSel 0; }]; \ No newline at end of file diff --git a/addons/main/functions/attributes/fn_slider_onAttributeSave.sqf b/addons/main/functions/attributes/fn_slider_onAttributeSave.sqf index 706c15e4..8c4b88c3 100644 --- a/addons/main/functions/attributes/fn_slider_onAttributeSave.sqf +++ b/addons/main/functions/attributes/fn_slider_onAttributeSave.sqf @@ -15,4 +15,4 @@ params ["_ctrlGroup"]; -sliderposition (_ctrlGroup controlsGroupCtrl 100) \ No newline at end of file +sliderPosition (_ctrlGroup controlsGroupCtrl 100) \ No newline at end of file diff --git a/addons/main/functions/interface/fn_3DENMinimap.sqf b/addons/main/functions/interface/fn_3DENMinimap.sqf index f83d87c1..b360bcf7 100644 --- a/addons/main/functions/interface/fn_3DENMinimap.sqf +++ b/addons/main/functions/interface/fn_3DENMinimap.sqf @@ -71,8 +71,8 @@ private _code = case 1: //Small { [ - safezoneX + 62 * GRID_W, - safezoneY + 14 * GRID_H, + safeZoneX + 62 * GRID_W, + safeZoneY + 14 * GRID_H, 32 * GRID_W, 32 * GRID_H ]; @@ -80,8 +80,8 @@ private _code = case 2: //Medium { [ - safezoneX + 62 * GRID_W, - safezoneY + 14 * GRID_H, + safeZoneX + 62 * GRID_W, + safeZoneY + 14 * GRID_H, 62 * GRID_W, 62 * GRID_H ]; @@ -89,8 +89,8 @@ private _code = case 3: //Large { [ - safezoneX + 62 * GRID_W, - safezoneY + 14 * GRID_H, + safeZoneX + 62 * GRID_W, + safeZoneY + 14 * GRID_H, 92 * GRID_W, 92 * GRID_H ]; diff --git a/addons/main/functions/interface/fn_assetBrowser_collapse.sqf b/addons/main/functions/interface/fn_assetBrowser_collapse.sqf index 35b93b65..e7633007 100644 --- a/addons/main/functions/interface/fn_assetBrowser_collapse.sqf +++ b/addons/main/functions/interface/fn_assetBrowser_collapse.sqf @@ -35,5 +35,5 @@ if (profileNamespace getVariable ["ENH_EditorPreferences_Interface_CollapseAsset { private _ctrlTree = findDisplay IDD_DISPLAY3DEN displayCtrl _x; [] call _fnc_collapse; - } foreach [IDC_DISPLAY3DEN_CREATE_ALL]; + } forEach [IDC_DISPLAY3DEN_CREATE_ALL]; }; \ No newline at end of file diff --git a/addons/main/functions/interface/fn_favoritesList.sqf b/addons/main/functions/interface/fn_favoritesList.sqf index 1b6f7759..df4ed953 100644 --- a/addons/main/functions/interface/fn_favoritesList.sqf +++ b/addons/main/functions/interface/fn_favoritesList.sqf @@ -124,7 +124,7 @@ switch _mode do }; profileNamespace setVariable ["ENH_HashMap_Favorites", _savedData]; - saveprofileNamespace; + saveProfileNamespace; ["updateTreeView"] call ENH_fnc_favoritesList; }; @@ -219,7 +219,7 @@ switch _mode do } forEach _selection; profileNamespace setVariable ["ENH_HashMap_Favorites", _savedData]; - saveprofileNamespace; + saveProfileNamespace; ["updateTreeView"] call ENH_fnc_favoritesList; }; diff --git a/addons/main/functions/interface/fn_locationList_enhanced.sqf b/addons/main/functions/interface/fn_locationList_enhanced.sqf index d0cccf27..86682f45 100644 --- a/addons/main/functions/interface/fn_locationList_enhanced.sqf +++ b/addons/main/functions/interface/fn_locationList_enhanced.sqf @@ -126,7 +126,7 @@ switch (_mode) do private _name = ""; if (_x isEqualType objNull) then { - _name = getText (configfile >> "CfgVehicles" >> typeOf _x >> "displayName"); + _name = getText (configFile >> "CfgVehicles" >> typeOf _x >> "displayName"); if (_name isEqualTo "") then { _name = getModelInfo _x # 0; diff --git a/addons/main/functions/internal/fn_checkShortCutsDuplicates.sqf b/addons/main/functions/internal/fn_checkShortCutsDuplicates.sqf index 9becbb1f..bb29cd6c 100644 --- a/addons/main/functions/internal/fn_checkShortCutsDuplicates.sqf +++ b/addons/main/functions/internal/fn_checkShortCutsDuplicates.sqf @@ -16,11 +16,11 @@ */ -private _contextMenuEntries = "true" configClasses (configfile >> "Display3DEN" >> "ContextMenu" >> "Items"); +private _contextMenuEntries = "true" configClasses (configFile >> "Display3DEN" >> "ContextMenu" >> "Items"); private _contextMenuShortCuts = []; private _contextMenuShortCutsUnique = []; -private _menuStripEntries = "true" configClasses (configfile >> "Display3DEN" >> "Controls" >> "MenuStrip" >> "Items"); +private _menuStripEntries = "true" configClasses (configFile >> "Display3DEN" >> "Controls" >> "MenuStrip" >> "Items"); private _menuStripShortCuts = []; private _menuStripShortCutsUnique = []; diff --git a/addons/main/functions/internal/fn_exportAttributesToGitHub.sqf b/addons/main/functions/internal/fn_exportAttributesToGitHub.sqf index 171ab297..636dc553 100644 --- a/addons/main/functions/internal/fn_exportAttributesToGitHub.sqf +++ b/addons/main/functions/internal/fn_exportAttributesToGitHub.sqf @@ -97,5 +97,5 @@ _export = format ["'''Total number of Attributes: %1'''", _counter] + endl + end _export = _export regexReplace ["\\n", endl]; -uinamespace setVariable ["display3DENCopy_data", ["Menu Strip Documentation", _export]]; +uiNamespace setVariable ["display3DENCopy_data", ["Menu Strip Documentation", _export]]; findDisplay 313 createDisplay "display3denCopy"; \ No newline at end of file diff --git a/addons/main/functions/internal/fn_exportContextMenuToGitHub.sqf b/addons/main/functions/internal/fn_exportContextMenuToGitHub.sqf index 84acaed0..4c8d4efe 100644 --- a/addons/main/functions/internal/fn_exportContextMenuToGitHub.sqf +++ b/addons/main/functions/internal/fn_exportContextMenuToGitHub.sqf @@ -39,5 +39,5 @@ private _export = format ["_**Number of added entries: %1**_", count _contextMen _export = _export + "Action: " + "```" + _action + "```" + endl; } forEach _items; -uinamespace setVariable ["display3DENCopy_data", ["Context Menu Documentation", trim _export]]; +uiNamespace setVariable ["display3DENCopy_data", ["Context Menu Documentation", trim _export]]; findDisplay IDD_DISPLAY3DEN createDisplay "display3denCopy"; \ No newline at end of file diff --git a/addons/main/functions/internal/fn_exportMenuStripToGitHub.sqf b/addons/main/functions/internal/fn_exportMenuStripToGitHub.sqf index 38a7bbd1..99a62cfa 100644 --- a/addons/main/functions/internal/fn_exportMenuStripToGitHub.sqf +++ b/addons/main/functions/internal/fn_exportMenuStripToGitHub.sqf @@ -49,5 +49,5 @@ private _export = format ["_**Number of added entries: %1**_", count _menuStipEn }; } forEach _items; -uinamespace setVariable ["display3DENCopy_data", ["Menu Strip Documentation", trim _export]]; +uiNamespace setVariable ["display3DENCopy_data", ["Menu Strip Documentation", trim _export]]; findDisplay IDD_DISPLAY3DEN createDisplay "display3denCopy"; \ No newline at end of file diff --git a/addons/main/functions/log/fn_3DENLog.sqf b/addons/main/functions/log/fn_3DENLog.sqf index 6707490d..46cb402c 100644 --- a/addons/main/functions/log/fn_3DENLog.sqf +++ b/addons/main/functions/log/fn_3DENLog.sqf @@ -124,7 +124,7 @@ switch (_mode) do private _maxHeight = abs ((_p2 # 2) - (_p1 # 2)); _size = str [_maxWidth, _maxLength, _maxHeight]; - private _parents = str ([configfile >> "CfgVehicles" >> _class, true] call BIS_fnc_returnParents); + private _parents = str ([configFile >> "CfgVehicles" >> _class, true] call BIS_fnc_returnParents); private _modelInfo = str getModelInfo _x; private _kind = "N/A"; diff --git a/addons/main/functions/log/fn_exportGUIDefines.sqf b/addons/main/functions/log/fn_exportGUIDefines.sqf index a1fbea77..17c8f3df 100644 --- a/addons/main/functions/log/fn_exportGUIDefines.sqf +++ b/addons/main/functions/log/fn_exportGUIDefines.sqf @@ -118,7 +118,7 @@ if (_classes == 0) then }; //Set variable used by display3denCopy and create the display -uinamespace setVariable ["display3DENCopy_data", ["", _return]]; +uiNamespace setVariable ["display3DENCopy_data", ["", _return]]; findDisplay IDD_EXPORTGUIDEFINES createDisplay "display3denCopy"; diff --git a/addons/main/functions/log/fn_exportLoadout.sqf b/addons/main/functions/log/fn_exportLoadout.sqf index af6f7698..02519d19 100644 --- a/addons/main/functions/log/fn_exportLoadout.sqf +++ b/addons/main/functions/log/fn_exportLoadout.sqf @@ -35,7 +35,7 @@ private _fnc_addArray = if (_x == "") then {continue}; if (_forEachIndex > 0) then {_export = _export + ", "}; _export = _export + format ["""%1""", _x]; - } foreach _array; + } forEach _array; _export = _export + "};" + LB; }; @@ -53,7 +53,7 @@ private _magsInWeapons = flatten (weaponsItems _object apply { [_mag, _tube] }); -private _assignedItems = assigneditems _object; +private _assignedItems = assignedItems _object; private _gear = [vest _object, headgear _object, goggles _object]; private _export = ""; diff --git a/addons/main/functions/misc/fn_VHCTools.sqf b/addons/main/functions/misc/fn_VHCTools.sqf index 17e3255f..b0f5c018 100644 --- a/addons/main/functions/misc/fn_VHCTools.sqf +++ b/addons/main/functions/misc/fn_VHCTools.sqf @@ -58,9 +58,9 @@ switch (_mode) do _items pushBack configName _x; _items pushBack selectRandom [0, 1]; }; - } foreach (configProperties [_x, "isClass _x", true]); + } forEach (configProperties [_x, "isClass _x", true]); _data pushBack _items; - } foreach [configFile >> "CfgVehicles" >> _type >> "textureSources", configFile >> "CfgVehicles" >> _type >> "animationSources"]; + } forEach [configFile >> "CfgVehicles" >> _type >> "textureSources", configFile >> "CfgVehicles" >> _type >> "animationSources"]; _data params ["_textures", "_animations"]; _textures = _textures select {_x isEqualType ""}; //Only select the textures and ignore the state _x set3DENAttribute ["VehicleCustomization", [[], _animations]]; //Only animations are set via this attribute. Textures are handled differently diff --git a/addons/main/functions/misc/fn_centerMapOnSelection.sqf b/addons/main/functions/misc/fn_centerMapOnSelection.sqf index 4641b224..d52b1346 100644 --- a/addons/main/functions/misc/fn_centerMapOnSelection.sqf +++ b/addons/main/functions/misc/fn_centerMapOnSelection.sqf @@ -20,7 +20,7 @@ if (get3DENActionState "toggleMap" > 0) then { //Get the map in Eden Editor - private _ctrlmap = findDisplay 313 displayctrl 51; + private _ctrlmap = findDisplay 313 displayCtrl 51; //Animate the map _ctrlmap ctrlMapAnimAdd [0.1, ctrlMapScale _ctrlmap, _position3D]; diff --git a/addons/main/functions/misc/fn_createBackupMissionSQM.sqf b/addons/main/functions/misc/fn_createBackupMissionSQM.sqf index 1b162abd..fb4f48ab 100644 --- a/addons/main/functions/misc/fn_createBackupMissionSQM.sqf +++ b/addons/main/functions/misc/fn_createBackupMissionSQM.sqf @@ -22,10 +22,10 @@ if !(profileNamespace getVariable ["ENH_EditorPreferences_BackupMissionSQM", fal //Check if missionName is in presets private _blacklist = profileNamespace getVariable ["ENH_EditorPreferences_BackupMissionSQMBlacklist", ""]; -if (toLower missionName in tolower _blacklist) exitWith {}; +if (toLower missionName in toLower _blacklist) exitWith {}; //Pythia is needed -if !(isClass (configfile >> "CfgPatches" >> "PY3_Pythia")) exitWith +if !(isClass (configFile >> "CfgPatches" >> "PY3_Pythia")) exitWith { if (profileNamespace getVariable ["ENH_EditorPreferences_BackupMissionSQM", false]) then { diff --git a/addons/main/functions/misc/fn_getAllItems.sqf b/addons/main/functions/misc/fn_getAllItems.sqf index 92480ef3..520a258e 100644 --- a/addons/main/functions/misc/fn_getAllItems.sqf +++ b/addons/main/functions/misc/fn_getAllItems.sqf @@ -51,7 +51,7 @@ if (uiNamespace getVariable ["ENH_ESE_itemsHashMap", []] isNotEqualTo []) exitWith {}; -private _allItemConfigs = (CONDITION configClasses (configfile >> "CfgWeapons")) + (CONDITION configClasses (configFile >> "CfgMagazines")) + +private _allItemConfigs = (CONDITION configClasses (configFile >> "CfgWeapons")) + (CONDITION configClasses (configFile >> "CfgMagazines")) + (CONDITION configClasses (configFile >> "CfgGlasses")) + (CONDITION configClasses (configFile >> "CfgVehicles")); private _itemsConfigVaules = [_allItemConfigs] call ENH_fnc_ESE_getConfigValues; diff --git a/addons/main/functions/misc/fn_getConfigSourceAddon.sqf b/addons/main/functions/misc/fn_getConfigSourceAddon.sqf index 50cdb8d5..01035819 100644 --- a/addons/main/functions/misc/fn_getConfigSourceAddon.sqf +++ b/addons/main/functions/misc/fn_getConfigSourceAddon.sqf @@ -26,7 +26,7 @@ private _sourceConfigs = configSourceAddonList _config; //Exit if there are no source addons if (_sourceConfigs isEqualTo []) exitWith {[]}; -private _mods = configsourcemodlist (configfile >> "CfgPatches" >> _sourceConfigs # 0); +private _mods = configSourceModList (configFile >> "CfgPatches" >> _sourceConfigs # 0); //Exit if there are no mods if (_mods isEqualTo []) exitWith {[]}; diff --git a/addons/main/functions/misc/fn_pylonTools.sqf b/addons/main/functions/misc/fn_pylonTools.sqf index 52766819..5eb8571f 100644 --- a/addons/main/functions/misc/fn_pylonTools.sqf +++ b/addons/main/functions/misc/fn_pylonTools.sqf @@ -55,15 +55,15 @@ switch (_mode) do { _pylon = _pylon select [0, _turretIndex]; }; - _pylons pushback _pylon; + _pylons pushBack _pylon; _value = _value select [_index + 1, count _value - 1]; }; { _export = _export + format ["this setPylonLoadout [%1, ""%2""];", _forEachIndex + 1, _x] + endl - } foreach _pylons; + } forEach _pylons; - uinamespace setVariable ["display3DENCopy_data", [localize "STR_ENH_MAIN_TOOLS_EXPORTPYLONSTOSQF", _export]]; + uiNamespace setVariable ["display3DENCopy_data", [localize "STR_ENH_MAIN_TOOLS_EXPORTPYLONSTOSQF", _export]]; findDisplay 313 createDisplay "display3denCopy"; }; }; diff --git a/addons/main/functions/misc/fn_switchTime.sqf b/addons/main/functions/misc/fn_switchTime.sqf index 6a76a62f..80c37507 100644 --- a/addons/main/functions/misc/fn_switchTime.sqf +++ b/addons/main/functions/misc/fn_switchTime.sqf @@ -15,21 +15,21 @@ if !(is3DEN) exitWith {false}; if (isNil "ENH_savedEnvironment") then { - ENH_savedEnvironment = [daytime, fog, overcast, rain]; + ENH_savedEnvironment = [dayTime, fog, overcast, rain]; 0 setFog 0; 0 setOvercast 0; 0 setRain 0; forceWeatherChange; - skipTime (12 - daytime); + skipTime (12 - dayTime); } else { - ENH_savedEnvironment params ["_daytime", "_fog", "_overcast", "_rain"]; + ENH_savedEnvironment params ["_dayTime", "_fog", "_overcast", "_rain"]; 0 setFog _fog; 0 setOvercast _overcast; 0 setRain _rain; forceWeatherChange; - skipTime (_daytime - daytime); + skipTime (_dayTime - dayTime); ENH_savedEnvironment = nil; }; diff --git a/addons/main/script_component.hpp b/addons/main/script_component.hpp index 0a778d07..6ba36d9e 100644 --- a/addons/main/script_component.hpp +++ b/addons/main/script_component.hpp @@ -38,14 +38,14 @@ //Either uses full width and leave only 5 grids left and right, //or it uses a maximum of 400 grids. This way, on ultra wide and super ultra wide, //the UI will not become too wide -#define WINDOW_W_WIDE ((safezoneW / GRID_W - 10) min 400) +#define WINDOW_W_WIDE ((safeZoneW / GRID_W - 10) min 400) //Width of edit attributes window #define WINDOW_W_ATTRIBUTES 140 //Statusbar #define SPACE_X (2 * pixelW) -#define ORIGIN_X_STATUSBAR (safezoneW - 60 * GRID_W) +#define ORIGIN_X_STATUSBAR (safeZoneW - 60 * GRID_W) #define CTRL(IDC) (_display displayCtrl IDC) #define G_PREF(A) ("Preferences" get3DENMissionAttribute A) diff --git a/include/a3/3den/ui/macros.inc b/include/a3/3den/ui/macros.inc index 65b58fe3..5dbdfe92 100644 --- a/include/a3/3den/ui/macros.inc +++ b/include/a3/3den/ui/macros.inc @@ -9,11 +9,11 @@ //720px #define WINDOW_W 120 #define WINDOW_H 180 -#define WINDOW_HAbs (safezoneH min (WINDOW_H * GRID_H)) +#define WINDOW_HAbs (safeZoneH min (WINDOW_H * GRID_H)) #define WINDOW_PREVIEW_W WINDOW_W #define WINDOW_PREVIEW_H 65 -#define WINDOW_PREVIEW_HAbs (safezoneH min (WINDOW_PREVIEW_H * GRID_H)) +#define WINDOW_PREVIEW_HAbs (safeZoneH min (WINDOW_PREVIEW_H * GRID_H)) #define ATTRIBUTE_TITLE_W 48 #define ATTRIBUTE_CONTENT_W 82 diff --git a/include/a3/ui_f/hpp/definecommongrids.inc b/include/a3/ui_f/hpp/definecommongrids.inc index a445bf72..b3b810e0 100644 --- a/include/a3/ui_f/hpp/definecommongrids.inc +++ b/include/a3/ui_f/hpp/definecommongrids.inc @@ -3,15 +3,15 @@ /////////////////////////////////////////////////////////////////////////// //--- Hack to avoid too large display upon first startup (fixed in engine) -//#define GUI_GRID_OLD_WAbs ((safezoneW / ((floor (safezoneW / safezoneH)) max 1)) min 1.2) +//#define GUI_GRID_OLD_WAbs ((safezoneW / ((floor (safezoneW / safeZoneH)) max 1)) min 1.2) //--- New grid for new A3 displays -#define GUI_GRID_WAbs ((safezoneW / safezoneH) min 1.2) +#define GUI_GRID_WAbs ((safezoneW / safeZoneH) min 1.2) #define GUI_GRID_HAbs (GUI_GRID_WAbs / 1.2) #define GUI_GRID_W (GUI_GRID_WAbs / 40) #define GUI_GRID_H (GUI_GRID_HAbs / 25) #define GUI_GRID_X (safezoneX) -#define GUI_GRID_Y (safezoneY + safezoneH - GUI_GRID_HAbs) +#define GUI_GRID_Y (safezoneY + safeZoneH - GUI_GRID_HAbs) //--- MUF - Test grid used in MP #define GUI_GRID_MP_WAbs GUI_GRID_WAbs @@ -27,7 +27,7 @@ #define GUI_GRID_CENTER_W GUI_GRID_W #define GUI_GRID_CENTER_H GUI_GRID_H #define GUI_GRID_CENTER_X (safezoneX + (safezoneW - GUI_GRID_CENTER_WAbs)/2) -#define GUI_GRID_CENTER_Y (safezoneY + (safezoneH - GUI_GRID_CENTER_HAbs)/2) +#define GUI_GRID_CENTER_Y (safezoneY + (safeZoneH - GUI_GRID_CENTER_HAbs)/2) //--- Bottom center position (used by Revive UI) #define GUI_GRID_CENTER_BOTTOM_WAbs GUI_GRID_WAbs @@ -35,7 +35,7 @@ #define GUI_GRID_CENTER_BOTTOM_W GUI_GRID_W #define GUI_GRID_CENTER_BOTTOM_H GUI_GRID_H #define GUI_GRID_CENTER_BOTTOM_X (safezoneX + (safezoneW - GUI_GRID_CENTER_WAbs)/2) -#define GUI_GRID_CENTER_BOTTOM_Y (safezoneY + safezoneH - GUI_GRID_CENTER_HAbs) +#define GUI_GRID_CENTER_BOTTOM_Y (safezoneY + safeZoneH - GUI_GRID_CENTER_HAbs) //--- Screen Top Center #define GUI_GRID_TOPCENTER_WAbs GUI_GRID_WAbs @@ -174,7 +174,7 @@ //--- IGUI GPS #define IGUI_GRID_GPS_XDef (safezoneX + safezoneW - 11 * GUI_GRID_W) -#define IGUI_GRID_GPS_YDef (safezoneY + safezoneH - 20.5 * GUI_GRID_H) +#define IGUI_GRID_GPS_YDef (safezoneY + safeZoneH - 20.5 * GUI_GRID_H) #define IGUI_GRID_GPS_WDef (10 * GUI_GRID_W) #define IGUI_GRID_GPS_HDef (10 * GUI_GRID_H) #define IGUI_GRID_GPS_X (profilenamespace getvariable ['IGUI_GRID_GPS_X',IGUI_GRID_GPS_XDef]) @@ -184,7 +184,7 @@ //--- IGUI AV Camera #define IGUI_GRID_AVCAMERA_XDef (safezoneX + safezoneW - 11.6 * GUI_GRID_W) -#define IGUI_GRID_AVCAMERA_YDef (safezoneY + safezoneH - 17.2 * GUI_GRID_H) +#define IGUI_GRID_AVCAMERA_YDef (safezoneY + safeZoneH - 17.2 * GUI_GRID_H) #define IGUI_GRID_AVCAMERA_WDef (10.6 * GUI_GRID_W) #define IGUI_GRID_AVCAMERA_HDef (6.7 * GUI_GRID_H) #define IGUI_GRID_AVCAMERA_X (profilenamespace getvariable ['IGUI_GRID_AVCAMERA_X',IGUI_GRID_AVCAMERA_XDef]) @@ -194,7 +194,7 @@ //--- IGUI IGUI Chat Log #define IGUI_GRID_CHAT_XDef (safezoneX + 1 * GUI_GRID_W) -#define IGUI_GRID_CHAT_YDef (safezoneY + safezoneH - 10.5 * GUI_GRID_H) +#define IGUI_GRID_CHAT_YDef (safezoneY + safeZoneH - 10.5 * GUI_GRID_H) #define IGUI_GRID_CHAT_WDef (20 * GUI_GRID_W) #define IGUI_GRID_CHAT_HDef (5 * GUI_GRID_H) #define IGUI_GRID_CHAT_X (profilenamespace getvariable ["IGUI_GRID_CHAT_X",IGUI_GRID_CHAT_XDef]) @@ -206,7 +206,7 @@ #define IGUI_GRID_BAR_WAbs (36 * GUI_GRID_W) #define IGUI_GRID_BAR_HAbs (4 * GUI_GRID_H) #define IGUI_GRID_BAR_XDef (safezoneX + 1 * GUI_GRID_W) -#define IGUI_GRID_BAR_YDef (safezoneY + safezoneH - 4.5 * GUI_GRID_H) +#define IGUI_GRID_BAR_YDef (safezoneY + safeZoneH - 4.5 * GUI_GRID_H) #define IGUI_GRID_BAR_X (profilenamespace getvariable ["IGUI_GRID_BAR_X",IGUI_GRID_BAR_XDef]) #define IGUI_GRID_BAR_Y (profilenamespace getvariable ["IGUI_GRID_BAR_Y",IGUI_GRID_BAR_YDef]) #define IGUI_GRID_BAR_W GUI_GRID_W @@ -226,7 +226,7 @@ #define IGUI_GRID_MISSION_WAbs (20 * GUI_GRID_W) #define IGUI_GRID_MISSION_HAbs (5 * GUI_GRID_H) #define IGUI_GRID_MISSION_XDef (safezoneX + safezoneW - 21 * GUI_GRID_W) -#define IGUI_GRID_MISSION_YDef (safezoneY + safezoneH - 10.5 * GUI_GRID_H) +#define IGUI_GRID_MISSION_YDef (safezoneY + safeZoneH - 10.5 * GUI_GRID_H) #define IGUI_GRID_MISSION_X (profilenamespace getvariable ["IGUI_GRID_MISSION_X",IGUI_GRID_MISSION_XDef]) #define IGUI_GRID_MISSION_Y (profilenamespace getvariable ["IGUI_GRID_MISSION_Y",IGUI_GRID_MISSION_YDef]) #define IGUI_GRID_MISSION_W GUI_GRID_W @@ -236,9 +236,9 @@ #define IGUI_GRID_CUSTOMINFO_WDef (10 * GUI_GRID_W) #define IGUI_GRID_CUSTOMINFO_HDef (10 * GUI_GRID_H) #define IGUI_GRID_CUSTOMINFOLEFT_XDef (safezoneX + 0.5 * GUI_GRID_W) -#define IGUI_GRID_CUSTOMINFOLEFT_YDef (safezoneY + safezoneH - 21 * GUI_GRID_H) +#define IGUI_GRID_CUSTOMINFOLEFT_YDef (safezoneY + safeZoneH - 21 * GUI_GRID_H) #define IGUI_GRID_CUSTOMINFORIGHT_XDef ((safezoneX + safezoneW) - (IGUI_GRID_CUSTOMINFO_WDef + 0.5 * GUI_GRID_W)) -#define IGUI_GRID_CUSTOMINFORIGHT_YDef (safezoneY + safezoneH - 21 * GUI_GRID_H) +#define IGUI_GRID_CUSTOMINFORIGHT_YDef (safezoneY + safeZoneH - 21 * GUI_GRID_H) #define IGUI_GRID_CUSTOMINFOLEFT_X (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFOLEFT_X",IGUI_GRID_CUSTOMINFOLEFT_XDef]) #define IGUI_GRID_CUSTOMINFOLEFT_Y (profilenamespace getvariable ["IGUI_GRID_CUSTOMINFOLEFT_Y",IGUI_GRID_CUSTOMINFOLEFT_YDef]) @@ -254,12 +254,12 @@ /////////////////////////////////////////////////////////////////////////// //--- Old grid, that is used for old A3 and TKOH displays -#define GUI_GRID_OLD_WAbs ((safezoneW / safezoneH) min 1.2) +#define GUI_GRID_OLD_WAbs ((safezoneW / safeZoneH) min 1.2) #define GUI_GRID_OLD_HAbs (GUI_GRID_OLD_WAbs / 1.2) #define GUI_GRID_OLD_W (GUI_GRID_OLD_WAbs / 32) #define GUI_GRID_OLD_H (GUI_GRID_OLD_HAbs / 20) #define GUI_GRID_OLD_X (safezoneX) -#define GUI_GRID_OLD_Y (safezoneY + safezoneH - GUI_GRID_OLD_HAbs) +#define GUI_GRID_OLD_Y (safezoneY + safeZoneH - GUI_GRID_OLD_HAbs) //MUF-TEST: Anchor near the right edge of the screen - when changing Interface size, this point doesn't change its X position #define GUI_ANCHOR_RIGHT (0.983 * safezoneW + safezoneX) @@ -271,7 +271,7 @@ #define GUI_GRID_OLD_CENTER_W GUI_GRID_OLD_W #define GUI_GRID_OLD_CENTER_H GUI_GRID_OLD_H #define GUI_GRID_OLD_CENTER_X (safezoneX + (safezoneW - GUI_GRID_OLD_CENTER_WAbs)/2) -#define GUI_GRID_OLD_CENTER_Y (safezoneY + (safezoneH - GUI_GRID_OLD_CENTER_HAbs)/2) +#define GUI_GRID_OLD_CENTER_Y (safezoneY + (safeZoneH - GUI_GRID_OLD_CENTER_HAbs)/2) //--- 2D Editor #define GUI_GRID_OLD_EDITOR_WAbs GUI_GRID_OLD_CENTER_WAbs @@ -287,7 +287,7 @@ #define GUI_GRID_OLD_DEBUG_W GUI_GRID_OLD_W #define GUI_GRID_OLD_DEBUG_H GUI_GRID_OLD_H #define GUI_GRID_OLD_DEBUG_X (safezoneX + (safezoneW - GUI_GRID_OLD_DEBUG_WAbs)/2) -#define GUI_GRID_OLD_DEBUG_Y (safezoneY + safezoneH - GUI_GRID_OLD_DEBUG_HAbs) +#define GUI_GRID_OLD_DEBUG_Y (safezoneY + safeZoneH - GUI_GRID_OLD_DEBUG_HAbs) //--- IGUI Common #define IGUI_GRID_OLD_WAbs GUI_GRID_OLD_WAbs @@ -295,7 +295,7 @@ #define IGUI_GRID_OLD_W GUI_GRID_OLD_W #define IGUI_GRID_OLD_H GUI_GRID_OLD_H #define IGUI_GRID_OLD_X (safezoneX + (safezoneW - IGUI_GRID_OLD_WAbs) / 2) -#define IGUI_GRID_OLD_Y (safezoneY + safezoneH - IGUI_GRID_OLD_HAbs) +#define IGUI_GRID_OLD_Y (safezoneY + safeZoneH - IGUI_GRID_OLD_HAbs) //--- IGUI Bottom #define IGUI_GRID_OLD_BOTTOM_WAbs IGUI_GRID_OLD_WAbs @@ -303,12 +303,12 @@ #define IGUI_GRID_OLD_BOTTOM_W IGUI_GRID_OLD_W #define IGUI_GRID_OLD_BOTTOM_H IGUI_GRID_OLD_H #define IGUI_GRID_OLD_BOTTOM_X (safezoneX + (safezoneW - IGUI_GRID_OLD_BOTTOM_WAbs) / 2) -#define IGUI_GRID_OLD_BOTTOM_Y (safezoneY + safezoneH - IGUI_GRID_OLD_BOTTOM_HAbs) +#define IGUI_GRID_OLD_BOTTOM_Y (safezoneY + safeZoneH - IGUI_GRID_OLD_BOTTOM_HAbs) //--- IGUI Analogue Gauges ----------------------------------------------------------------------------------------------------- //--- Analogue gauge - Speed #define IGUI_GRID_GAUGESPEED_XDef (safezoneX + (safezoneW / 2) - 19.75 * GUI_GRID_W) -#define IGUI_GRID_GAUGESPEED_YDef (safezoneY + safezoneH - 11.7 * GUI_GRID_H) +#define IGUI_GRID_GAUGESPEED_YDef (safezoneY + safeZoneH - 11.7 * GUI_GRID_H) #define IGUI_GRID_GAUGESPEED_X (profilenamespace getvariable ['IGUI_GRID_GAUGESPEED_X',IGUI_GRID_GAUGESPEED_XDef]) #define IGUI_GRID_GAUGESPEED_Y (profilenamespace getvariable ['IGUI_GRID_GAUGESPEED_Y',IGUI_GRID_GAUGESPEED_YDef]) #define IGUI_GRID_GAUGESPEED_WAbs (7.5 * GUI_GRID_W) @@ -316,7 +316,7 @@ //--- Analogue gauge - Alt #define IGUI_GRID_GAUGEALT_XDef (safezoneX + (safezoneW / 2) - 11.75 * GUI_GRID_W) -#define IGUI_GRID_GAUGEALT_YDef (safezoneY + safezoneH - 11.7 * GUI_GRID_H) +#define IGUI_GRID_GAUGEALT_YDef (safezoneY + safeZoneH - 11.7 * GUI_GRID_H) #define IGUI_GRID_GAUGEALT_X (profilenamespace getvariable ['IGUI_GRID_GAUGEALT_X',IGUI_GRID_GAUGEALT_XDef]) #define IGUI_GRID_GAUGEALT_Y (profilenamespace getvariable ['IGUI_GRID_GAUGEALT_Y',IGUI_GRID_GAUGEALT_YDef]) #define IGUI_GRID_GAUGEALT_WAbs (7.5 * GUI_GRID_W) @@ -324,7 +324,7 @@ //--- Analogue gauge - Horizon #define IGUI_GRID_GAUGEHORIZON_XDef (safezoneX + ((safezoneW - 7.5 * GUI_GRID_W) / 2)) -#define IGUI_GRID_GAUGEHORIZON_YDef (safezoneY + safezoneH - 11.7 * GUI_GRID_H) +#define IGUI_GRID_GAUGEHORIZON_YDef (safezoneY + safeZoneH - 11.7 * GUI_GRID_H) #define IGUI_GRID_GAUGEHORIZON_X (profilenamespace getvariable ['IGUI_GRID_GAUGEHORIZON_X',IGUI_GRID_GAUGEHORIZON_XDef]) #define IGUI_GRID_GAUGEHORIZON_Y (profilenamespace getvariable ['IGUI_GRID_GAUGEHORIZON_Y',IGUI_GRID_GAUGEHORIZON_YDef]) #define IGUI_GRID_GAUGEHORIZON_WAbs (7.5 * GUI_GRID_W) @@ -332,7 +332,7 @@ //--- Analogue gauge - Stability #define IGUI_GRID_GAUGESTABILITY_XDef (safezoneX + (safezoneW / 2) + 4.25 * GUI_GRID_W) -#define IGUI_GRID_GAUGESTABILITY_YDef (safezoneY + safezoneH - 11.7 * GUI_GRID_H) +#define IGUI_GRID_GAUGESTABILITY_YDef (safezoneY + safeZoneH - 11.7 * GUI_GRID_H) #define IGUI_GRID_GAUGESTABILITY_X (profilenamespace getvariable ['IGUI_GRID_GAUGESTABILITY_X',IGUI_GRID_GAUGESTABILITY_XDef]) #define IGUI_GRID_GAUGESTABILITY_Y (profilenamespace getvariable ['IGUI_GRID_GAUGESTABILITY_Y',IGUI_GRID_GAUGESTABILITY_YDef]) #define IGUI_GRID_GAUGESTABILITY_WAbs (7.5 * GUI_GRID_W) @@ -340,7 +340,7 @@ //--- Analogue gauge - Compass #define IGUI_GRID_GAUGECOMPASS_XDef (safezoneX + (safezoneW / 2) + 12.25 * GUI_GRID_W) -#define IGUI_GRID_GAUGECOMPASS_YDef (safezoneY + safezoneH - 11.7 * GUI_GRID_H) +#define IGUI_GRID_GAUGECOMPASS_YDef (safezoneY + safeZoneH - 11.7 * GUI_GRID_H) #define IGUI_GRID_GAUGECOMPASS_X (profilenamespace getvariable ['IGUI_GRID_GAUGECOMPASS_X',IGUI_GRID_GAUGECOMPASS_XDef]) #define IGUI_GRID_GAUGECOMPASS_Y (profilenamespace getvariable ['IGUI_GRID_GAUGECOMPASS_Y',IGUI_GRID_GAUGECOMPASS_YDef]) #define IGUI_GRID_GAUGECOMPASS_WAbs (7.5 * GUI_GRID_W) @@ -348,7 +348,7 @@ //--- Sling Load Assistant #define IGUI_GRID_SLINGLOADASSISTANT_XDef (safezoneX + safezoneW - 8 * GUI_GRID_W) -#define IGUI_GRID_SLINGLOADASSISTANT_YDef (safezoneY + safezoneH - 19.5 * GUI_GRID_H) +#define IGUI_GRID_SLINGLOADASSISTANT_YDef (safezoneY + safeZoneH - 19.5 * GUI_GRID_H) #define IGUI_GRID_SLINGLOADASSISTANT_WDef (7 * GUI_GRID_W) #define IGUI_GRID_SLINGLOADASSISTANT_HDef (9.5 * GUI_GRID_H) #define IGUI_GRID_SLINGLOADASSISTANT_X (profilenamespace getvariable ['IGUI_GRID_SLINGLOADASSISTANT_X',IGUI_GRID_SLINGLOADASSISTANT_XDef]) @@ -397,6 +397,6 @@ #define GUI_GRID_OLD_AV_TERMINAL_X (safezoneX) #define GUI_GRID_OLD_AV_TERMINAL_Y (safezoneY) #define GUI_GRID_OLD_AV_TERMINAL_W (safezoneW / 64) -#define GUI_GRID_OLD_AV_TERMINAL_H (safezoneH / 40) +#define GUI_GRID_OLD_AV_TERMINAL_H (safeZoneH / 40) #define GUI_GRID_OLD_AV_TERMINAL_WAbs (safezoneW) -#define GUI_GRID_OLD_AV_TERMINAL_HAbs (safezoneH) \ No newline at end of file +#define GUI_GRID_OLD_AV_TERMINAL_HAbs (safeZoneH) \ No newline at end of file