diff --git a/.github/workflows/arma.yml b/.github/workflows/arma.yml index 293c2d3..5ce5e58 100644 --- a/.github/workflows/arma.yml +++ b/.github/workflows/arma.yml @@ -25,6 +25,6 @@ jobs: - name: Checkout the source code uses: actions/checkout@v4 - name: Setup HEMTT - uses: arma-actions/hemtt@v1 + uses: arma-actions/hemtt@main - name: Run HEMTT build - run: hemtt build + run: hemtt build --no-bin diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4b7386..53c7f30 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v4 - name: Setup HEMTT - uses: arma-actions/hemtt@v1 + uses: arma-actions/hemtt@main - name: Setup Tools run: | @@ -60,11 +60,13 @@ jobs: run: mv .hemttout/release .hemttout/@${{ env.MOD_NAME }} - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.MOD_NAME }} path: .hemttout/@* retention-days: 1 + include-hidden-files: true # Because .hemttout is a hidden directory + if-no-files-found: error publish-release: needs: build @@ -72,7 +74,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Prepare Archives run: | @@ -83,7 +85,7 @@ jobs: - name: Prepare GitHub Release id: release_drafter - uses: release-drafter/release-drafter@v5 + uses: release-drafter/release-drafter@v6 with: name: Version ${{ needs.build.outputs.VERSION_SHORT }} tag: v${{ needs.build.outputs.VERSION }} @@ -92,7 +94,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload mod archive to GitHub Release - uses: shogo82148/actions-upload-release-asset@v1.7.2 + uses: shogo82148/actions-upload-release-asset@v1.7.7 with: upload_url: ${{ steps.release_drafter.outputs.upload_url }} asset_path: ./${{ needs.build.outputs.MOD_NAME }}_${{ needs.build.outputs.VERSION_SHORT }}.zip diff --git a/.hemtt/project.toml b/.hemtt/project.toml index e7005d4..be1586a 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -20,14 +20,6 @@ authority = "mts_enhanced" [version] git_hash = 0 -[asc] -enabled = true -exclude = [ - "/initsettings.sqf", - "/initkeybinds.sqf", - "/xeh_prep.sqf", -] - [hemtt.config] preset = "Hemtt" diff --git a/README.md b/README.md index 3de480a..4c625a0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- Metis Enhanced Version + Metis Enhanced Version Metis Enhanced Downloads diff --git a/addons/armory/XEH_postInit.sqf b/addons/armory/XEH_postInit.sqf index ad6c652..8fd0062 100644 --- a/addons/armory/XEH_postInit.sqf +++ b/addons/armory/XEH_postInit.sqf @@ -2,7 +2,7 @@ [QGVAR(updateArsenal), FUNC(updateArsenal)] call CBA_fnc_addEventHandler; -TRACE_2("", isDedicated, GVAR(allowPlayerDBConnection)); +TRACE_2("",isDedicated,GVAR(allowPlayerDBConnection)); if (isDedicated || (isServer && GVAR(allowPlayerDBConnection))) then { @@ -38,15 +38,15 @@ if (isDedicated || (isServer && GVAR(allowPlayerDBConnection))) then { publicVariable QGVAR(initialized); }; -if (hasinterface) then { +if (hasInterface) then { [QGVAR(openArmory), FUNC(openArmory)] call CBA_fnc_addEventhandler; [QGVAR(equipBackpack), FUNC(equipBackpack)] call CBA_fnc_addEventhandler; [QGVAR(equipLoadout), FUNC(equipLoadout)] call CBA_fnc_addEventhandler; [QGVAR(error), { params ["_unit", "_callBackEvent", "_args"]; - ERROR(format [ARR_4("Something went wrong: Unit: %1 | CallBackEvent: %2 | Args: %3", _unit, _callBackEvent, _args)]); - if (hasinterface) then { + ERROR_3("Something went wrong: Unit: %1 | CallBackEvent: %2 | Args: %3",_unit,_callBackEvent,_args); + if (hasInterface) then { hint "MTS Armory:\nSomething went wrong, please take a look into your logfiles."; }; }] call CBA_fnc_addEventhandler; diff --git a/addons/armory/defines.hpp b/addons/armory/defines.hpp index c202c66..d83d943 100644 --- a/addons/armory/defines.hpp +++ b/addons/armory/defines.hpp @@ -27,10 +27,10 @@ #define IDC_EDITBOX_EDITORS 27 #define IDC_BUTTON_SAVE_EDITORS 28 -#define BACKGROUND_1_DEFAULT_HEIGHT ((670 / 1080) * SafeZoneH) -#define BACKGROUND_1_EXTENDED_HEIGHT ((865 / 1080) * SafeZoneH) -#define BACKGROUND_2_DEFAULT_HEIGHT ((650 / 1080) * SafeZoneH) -#define BACKGROUND_2_EXTENDED_HEIGHT ((845 / 1080) * SafeZoneH) +#define BACKGROUND_1_DEFAULT_HEIGHT ((670 / 1080) * safeZoneH) +#define BACKGROUND_1_EXTENDED_HEIGHT ((865 / 1080) * safeZoneH) +#define BACKGROUND_2_DEFAULT_HEIGHT ((650 / 1080) * safeZoneH) +#define BACKGROUND_2_EXTENDED_HEIGHT ((845 / 1080) * safeZoneH) #define IDC_LOADOUT_1 101 #define IDC_LOADOUT_2 102 diff --git a/addons/armory/functions/fnc_createEquipment.sqf b/addons/armory/functions/fnc_createEquipment.sqf index 7df3bee..1e93475 100644 --- a/addons/armory/functions/fnc_createEquipment.sqf +++ b/addons/armory/functions/fnc_createEquipment.sqf @@ -19,7 +19,7 @@ */ private _argsSuccessfullyParsed = params [["_equipmentName", "", [""]], ["_editors", [], [[],""]], ["_object", objNull, [objNull]]]; -TRACE_4("",_equipmentName,_editors,_object, _argsSuccessfullyParsed); +TRACE_4("",_equipmentName,_editors,_object,_argsSuccessfullyParsed); if (_editors isEqualType "") then { _editors = parseSimpleArray _editors; diff --git a/addons/armory/functions/fnc_equipBackpack.sqf b/addons/armory/functions/fnc_equipBackpack.sqf index 23a60eb..c62d63a 100644 --- a/addons/armory/functions/fnc_equipBackpack.sqf +++ b/addons/armory/functions/fnc_equipBackpack.sqf @@ -32,7 +32,7 @@ if (_equipmentNamespaces isEqualTo []) exitWith { _equipmentNamespaces params ["", "_backpackNamespace"]; private _backpack = _backpackNamespace getVariable [_backpackName, []]; -CHECKRET(_backpack isEqualTo [], WARNING_1("Backpack '%1' not available!", _backpackName)); +CHECKRET(_backpack isEqualTo [],WARNING_1("Backpack '%1' not available!",_backpackName)); _backpack params ["", "", "_class", "_items"]; diff --git a/addons/armory/functions/fnc_equipLoadout.sqf b/addons/armory/functions/fnc_equipLoadout.sqf index 0b2c6ea..46bb532 100644 --- a/addons/armory/functions/fnc_equipLoadout.sqf +++ b/addons/armory/functions/fnc_equipLoadout.sqf @@ -32,7 +32,7 @@ if (_equipmentNamespaces isEqualTo []) exitWith { _equipmentNamespaces params ["_loadoutNamespace"]; private _loadout = _loadoutNamespace getVariable [_loadoutName, []]; -CHECKRET(_loadout isEqualTo [], WARNING_1("Loadout '%1' not available!", _loadoutName)); +CHECKRET(_loadout isEqualTo [],WARNING_1("Loadout '%1' not available!",_loadoutName)); _loadout params ["", "", "_loadout", "_ace_medic", "_ace_engineer"]; diff --git a/addons/armory/functions/fnc_initEquipment.sqf b/addons/armory/functions/fnc_initEquipment.sqf index bcda985..ba252e5 100644 --- a/addons/armory/functions/fnc_initEquipment.sqf +++ b/addons/armory/functions/fnc_initEquipment.sqf @@ -17,7 +17,7 @@ */ params [["_equipmentName", "", [""]]]; -TRACE_1("", _equipmentName); +TRACE_1("",_equipmentName); CHECKRET(!GVAR(initialized) || _equipmentName isEqualTo "",false); CHECKRET(!isDedicated && !(isServer && GVAR(allowPlayerDBConnection)),false); @@ -31,7 +31,7 @@ if (_equipmentInfo isEqualTo []) exitWith { }; (_equipmentInfo select 0) params ["_equipmentID", "_editors", "_arsenal"]; -TRACE_3("EquipmentInfo", _equipmentID, _editors, _arsenal); +TRACE_3("EquipmentInfo",_equipmentID,_editors,_arsenal); private _loadoutNamespace = [true] call CBA_fnc_createNamespace; private _backpackNamespace = [true] call CBA_fnc_createNamespace; diff --git a/addons/armory/functions/fnc_openArmory.sqf b/addons/armory/functions/fnc_openArmory.sqf index acef662..3322d5c 100644 --- a/addons/armory/functions/fnc_openArmory.sqf +++ b/addons/armory/functions/fnc_openArmory.sqf @@ -24,7 +24,7 @@ if (canSuspend) exitWith { }; params [["_equipmentName", "", [""]], ["_object", objNull, [objNull]], ["_idc", -1, [0]], ["_category", -1, [0]]]; -TRACE_4("",_equipmentName, _object, _idc, _category); +TRACE_4("",_equipmentName,_object,_idc,_category); CHECK(!GVAR(initialized) || _equipmentName isEqualTo ""); diff --git a/addons/armory/functions/fnc_openArsenal.sqf b/addons/armory/functions/fnc_openArsenal.sqf index 988fead..a6ccda4 100644 --- a/addons/armory/functions/fnc_openArsenal.sqf +++ b/addons/armory/functions/fnc_openArsenal.sqf @@ -30,11 +30,11 @@ if (ctrlVisible IDC_BUTTON_SAVE_EQUIPMENT) then { private _display = ctrlParent _ctrlArsenal; - private _object = (_display displayCtrl IDC_BUTTON_NEW_EQUIPMENT) getVariable [ARR_2(QGVAR(attachedObject), objNull)]; + private _object = (_display displayCtrl IDC_BUTTON_NEW_EQUIPMENT) getVariable [QGVAR(attachedObject), objNull]; private _ctrlSave = (_display displayCtrl IDC_BUTTON_SAVE_EQUIPMENT); - private _idc = _ctrlSave getVariable [ARR_2(QGVAR(idc), -1)]; - private _category = _ctrlSave getVariable [ARR_2(QGVAR(category), -1)]; + private _idc = _ctrlSave getVariable [QGVAR(idc), -1]; + private _category = _ctrlSave getVariable [QGVAR(category), -1]; GVAR(arsenalEditorReopeningVars) = [ctrlText IDC_TEXT_TITLE, _object, _idc, _category, _eventID]; TRACE_1("",GVAR(arsenalEditorReopeningVars)); diff --git a/addons/armory/functions/fnc_setEditArea.sqf b/addons/armory/functions/fnc_setEditArea.sqf index 6a5c3d8..8ce7d40 100644 --- a/addons/armory/functions/fnc_setEditArea.sqf +++ b/addons/armory/functions/fnc_setEditArea.sqf @@ -36,11 +36,11 @@ if (_category isEqualTo LOADOUT) then { (GVAR(equipment) getVariable [ctrlText IDC_TEXT_TITLE, []]) params ["_loadoutNamespace"]; (_loadoutNamespace getVariable [_name, []]) params ["", "", "", "_ace_medic", "_ace_engineer"]; - lbsetCurSel [IDC_LISTBOX_MEDIC, _ace_medic]; - lbsetCurSel [IDC_LISTBOX_ENGINEER, _ace_engineer]; + lbSetCurSel [IDC_LISTBOX_MEDIC, _ace_medic]; + lbSetCurSel [IDC_LISTBOX_ENGINEER, _ace_engineer]; } else { - lbsetCurSel [IDC_LISTBOX_MEDIC, 0]; - lbsetCurSel [IDC_LISTBOX_ENGINEER, 0]; + lbSetCurSel [IDC_LISTBOX_MEDIC, 0]; + lbSetCurSel [IDC_LISTBOX_ENGINEER, 0]; }; ctrlShow [IDC_LISTBOX_MEDIC, true]; ctrlShow [IDC_LISTBOX_ENGINEER, true]; diff --git a/addons/armory/functions/fnc_updateArsenal.sqf b/addons/armory/functions/fnc_updateArsenal.sqf index 78a8238..dc25db8 100644 --- a/addons/armory/functions/fnc_updateArsenal.sqf +++ b/addons/armory/functions/fnc_updateArsenal.sqf @@ -18,7 +18,7 @@ */ private _argsSuccessfullyParsed = params [["_equipmentName", "", [""]], ["_status", false, [false]]]; -TRACE_3("", _equipmentName, _status, _argsSuccessfullyParsed); +TRACE_3("",_equipmentName,_status,_argsSuccessfullyParsed); CHECK(!GVAR(initialized) || !_params); @@ -33,7 +33,7 @@ if (isDedicated || (isServer && GVAR(allowPlayerDBConnection))) then { } else { private _armoryDisplay = findDisplay IDD_EQUIPMENT; private _arsenalDisplay = findDisplay IDD_ACE_ARSENAL; - TRACE_2("", _armoryDisplay, _arsenalDisplay); + TRACE_2("",_armoryDisplay,_arsenalDisplay); if !(isNull _armoryDisplay) exitWith { private _title = ctrlText IDC_TEXT_TITLE; diff --git a/addons/armory/functions/fnc_updateBackpack.sqf b/addons/armory/functions/fnc_updateBackpack.sqf index 409a8f8..56cb333 100644 --- a/addons/armory/functions/fnc_updateBackpack.sqf +++ b/addons/armory/functions/fnc_updateBackpack.sqf @@ -34,7 +34,7 @@ CHECK(!isDedicated && !(isServer && GVAR(allowPlayerDBConnection))); (GVAR(equipment) getVariable [_equipmentName, []]) params ["", "_backpackNamespace", "", "_equipmentID"]; _backpackNamespace getVariable [_name, []] params ["", "_idc", "_class", "_items"]; -TRACE_7("updateBackpack",_equipmentName, _equipmentID,_name,_oldName,_idc,_class,_items); +TRACE_7("updateBackpack",_equipmentName,_equipmentID,_name,_oldName,_idc,_class,_items); if (_oldName isEqualTo "") exitWith { diff --git a/addons/armory/functions/fnc_updateLoadout.sqf b/addons/armory/functions/fnc_updateLoadout.sqf index a7d43ef..1b6adac 100644 --- a/addons/armory/functions/fnc_updateLoadout.sqf +++ b/addons/armory/functions/fnc_updateLoadout.sqf @@ -34,7 +34,7 @@ CHECK(!isDedicated && !(isServer && GVAR(allowPlayerDBConnection))); (GVAR(equipment) getVariable [_equipmentName, []]) params ["_loadoutNamespace", "", "", "_equipmentID"]; _loadoutNamespace getVariable [_name, []] params ["", "_idc", "_loadout", "_ace_medic", "_ace_engineer"]; -TRACE_8("updateLoadout",_equipmentName, _equipmentID,_name,_oldName,_idc,_ace_medic,_ace_engineer,_loadout); +TRACE_8("updateLoadout",_equipmentName,_equipmentID,_name,_oldName,_idc,_ace_medic,_ace_engineer,_loadout); if (_oldName isEqualTo "") exitWith { [GVAR(sessionID), "insertLoadout", _name, _idc, _loadout, _ace_medic, _ace_engineer, _equipmentID] call DB_SET; diff --git a/addons/armory/ui/RscAttributes.hpp b/addons/armory/ui/RscAttributes.hpp index 4c10d60..c31af82 100644 --- a/addons/armory/ui/RscAttributes.hpp +++ b/addons/armory/ui/RscAttributes.hpp @@ -34,34 +34,34 @@ class GVAR(dialog) { idc = IDC_BUTTON_ARSENAL; text = "Arsenal"; x = "SafeZoneX + (700 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(70 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE(_this call FUNC(openArsenal)); }; class Checkbox_Arsenal_Toggle : RscCheckBox { idc = IDC_CHECKBOX_ARSENAL; tooltip = "$STR_mts_Armory_checkbox_arsenalToggle_tooltip"; x = "SafeZoneX + (780 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onCheckedChanged = QUOTE([ARR_2(QQGVAR(updateArsenal),[ARR_2(ctrlText IDC_TEXT_TITLE,(cbChecked (_this select 0)))])] call CBA_fnc_globalEvent); }; class Text_Title : Text { idc = IDC_TEXT_TITLE; x = "SafeZoneX + (820 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(280 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Button_New_Equipment : Button_Image { idc = IDC_BUTTON_NEW_EQUIPMENT; tooltip = CSTRING(button_createEquipmentCategory_tooltip); x = "SafeZoneX + (1110 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([_this select 0] call LINKFUNC(openNewEquipmentDialog)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_NEW_EQUIPMENT) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_NEW_EQUIPMENT) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -70,9 +70,9 @@ class GVAR(dialog) { idc = IDC_BUTTON_SETTINGS; tooltip = CSTRING(button_toggleSettings_tooltip); x = "SafeZoneX + (1150 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([false] call LINKFUNC(toggleSettings)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_SETTINGS) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_SETTINGS) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -81,9 +81,9 @@ class GVAR(dialog) { idc = -1; tooltip = CSTRING(button_exitDialog_tooltip); x = "SafeZoneX + (1190 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE((ctrlParent (_this select 0)) closeDisplay 1); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EXIT) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EXIT) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -93,122 +93,122 @@ class GVAR(dialog) { idc = -1; text = CSTRING(text_loadout_title); x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (260 / 1080) * SafeZoneH"; + y = "SafeZoneY + (260 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Text_Backpacks : Text { idc = -1; text = CSTRING(text_backpack_title); x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (260 / 1080) * SafeZoneH"; + y = "SafeZoneY + (260 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; // Body loadout buttons ---------------------------------------- class Button_Loadout_1 : Button { idc = IDC_LOADOUT_1; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (310 / 1080) * SafeZoneH"; + y = "SafeZoneY + (310 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_2 : Button { idc = IDC_LOADOUT_2; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (350 / 1080) * SafeZoneH"; + y = "SafeZoneY + (350 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_3 : Button { idc = IDC_LOADOUT_3; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (390 / 1080) * SafeZoneH"; + y = "SafeZoneY + (390 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_4 : Button { idc = IDC_LOADOUT_4; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (430 / 1080) * SafeZoneH"; + y = "SafeZoneY + (430 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_5 : Button { idc = IDC_LOADOUT_5; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (470 / 1080) * SafeZoneH"; + y = "SafeZoneY + (470 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_6 : Button { idc = IDC_LOADOUT_6; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (510 / 1080) * SafeZoneH"; + y = "SafeZoneY + (510 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_7 : Button { idc = IDC_LOADOUT_7; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (550 / 1080) * SafeZoneH"; + y = "SafeZoneY + (550 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_8 : Button { idc = IDC_LOADOUT_8; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (590 / 1080) * SafeZoneH"; + y = "SafeZoneY + (590 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_9 : Button { idc = IDC_LOADOUT_9; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (630 / 1080) * SafeZoneH"; + y = "SafeZoneY + (630 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_10 : Button { idc = IDC_LOADOUT_10; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (670 / 1080) * SafeZoneH"; + y = "SafeZoneY + (670 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_11 : Button { idc = IDC_LOADOUT_11; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (710 / 1080) * SafeZoneH"; + y = "SafeZoneY + (710 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; class Button_Loadout_12 : Button { idc = IDC_LOADOUT_12; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (750 / 1080) * SafeZoneH"; + y = "SafeZoneY + (750 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipLoadout)); }; // Body loadout configure buttons ---------------------------------------- class Button_Loadout_Edit_1 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_1; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (310 / 1080) * SafeZoneH"; + y = "SafeZoneY + (310 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_1,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_1) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_1) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -216,9 +216,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_2 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_2; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (350 / 1080) * SafeZoneH"; + y = "SafeZoneY + (350 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_2,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_2) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_2) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -226,9 +226,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_3 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_3; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (390 / 1080) * SafeZoneH"; + y = "SafeZoneY + (390 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_3,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_3) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_3) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -236,9 +236,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_4 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_4; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (430 / 1080) * SafeZoneH"; + y = "SafeZoneY + (430 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_4,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_4) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_4) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -246,9 +246,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_5 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_5; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (470 / 1080) * SafeZoneH"; + y = "SafeZoneY + (470 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_5,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_5) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_5) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -256,9 +256,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_6 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_6; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (510 / 1080) * SafeZoneH"; + y = "SafeZoneY + (510 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_6,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_6) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_6) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -266,9 +266,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_7 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_7; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (550 / 1080) * SafeZoneH"; + y = "SafeZoneY + (550 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_7,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_7) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_7) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -276,9 +276,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_8 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_8; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (590 / 1080) * SafeZoneH"; + y = "SafeZoneY + (590 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_8,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_8) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_8) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -286,9 +286,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_9 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_9; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (630 / 1080) * SafeZoneH"; + y = "SafeZoneY + (630 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_9,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_9) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_9) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -296,9 +296,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_10 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_10; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (670 / 1080) * SafeZoneH"; + y = "SafeZoneY + (670 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_10,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_10) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_10) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -306,9 +306,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_11 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_11; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (710 / 1080) * SafeZoneH"; + y = "SafeZoneY + (710 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_11,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_11) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_11) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -316,9 +316,9 @@ class GVAR(dialog) { class Button_Loadout_Edit_12 : Button_Image { idc = IDC_BUTTON_EDIT_LOADOUT_12; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (750 / 1080) * SafeZoneH"; + y = "SafeZoneY + (750 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_LOADOUT_12,LOADOUT)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_12) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_LOADOUT_12) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -327,106 +327,106 @@ class GVAR(dialog) { class Button_Backpack_1 : Button { idc = IDC_BACKPACK_1; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (310 / 1080) * SafeZoneH"; + y = "SafeZoneY + (310 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_2 : Button { idc = IDC_BACKPACK_2; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (350 / 1080) * SafeZoneH"; + y = "SafeZoneY + (350 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_3 : Button { idc = IDC_BACKPACK_3; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (390 / 1080) * SafeZoneH"; + y = "SafeZoneY + (390 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_4 : Button { idc = IDC_BACKPACK_4; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (430 / 1080) * SafeZoneH"; + y = "SafeZoneY + (430 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_5 : Button { idc = IDC_BACKPACK_5; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (470 / 1080) * SafeZoneH"; + y = "SafeZoneY + (470 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_6 : Button { idc = IDC_BACKPACK_6; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (510 / 1080) * SafeZoneH"; + y = "SafeZoneY + (510 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_7 : Button { idc = IDC_BACKPACK_7; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (550 / 1080) * SafeZoneH"; + y = "SafeZoneY + (550 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_8 : Button { idc = IDC_BACKPACK_8; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (590 / 1080) * SafeZoneH"; + y = "SafeZoneY + (590 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_9 : Button { idc = IDC_BACKPACK_9; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (630 / 1080) * SafeZoneH"; + y = "SafeZoneY + (630 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_10 : Button { idc = IDC_BACKPACK_10; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (670 / 1080) * SafeZoneH"; + y = "SafeZoneY + (670 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_11 : Button { idc = IDC_BACKPACK_11; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (710 / 1080) * SafeZoneH"; + y = "SafeZoneY + (710 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; class Button_Backpack_12 : Button { idc = IDC_BACKPACK_12; x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (750 / 1080) * SafeZoneH"; + y = "SafeZoneY + (750 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText (_this select 0))] call LINKFUNC(equipBackpack)); }; // Body backpacks configure buttons ---------------------------------------- class Button_Backpack_Edit_1 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_1; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (310 / 1080) * SafeZoneH"; + y = "SafeZoneY + (310 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_1,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_1) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_1) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -434,9 +434,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_2 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_2; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (350 / 1080) * SafeZoneH"; + y = "SafeZoneY + (350 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_2,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_2) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_2) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -444,9 +444,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_3 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_3; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (390 / 1080) * SafeZoneH"; + y = "SafeZoneY + (390 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_3,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_3) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_3) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -454,9 +454,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_4 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_4; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (430 / 1080) * SafeZoneH"; + y = "SafeZoneY + (430 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_4,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_4) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_4) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -464,9 +464,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_5 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_5; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (470 / 1080) * SafeZoneH"; + y = "SafeZoneY + (470 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_5,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_5) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_5) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -474,9 +474,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_6 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_6; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (510 / 1080) * SafeZoneH"; + y = "SafeZoneY + (510 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_6,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_6) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_6) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -484,9 +484,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_7 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_7; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (550 / 1080) * SafeZoneH"; + y = "SafeZoneY + (550 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_7,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_7) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_7) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -494,9 +494,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_8 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_8; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (590 / 1080) * SafeZoneH"; + y = "SafeZoneY + (590 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_8,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_8) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_8) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -504,9 +504,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_9 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_9; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (630 / 1080) * SafeZoneH"; + y = "SafeZoneY + (630 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_9,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_9) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_9) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -514,9 +514,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_10 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_10; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (670 / 1080) * SafeZoneH"; + y = "SafeZoneY + (670 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_10,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_10) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_10) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -524,9 +524,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_11 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_11; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (710 / 1080) * SafeZoneH"; + y = "SafeZoneY + (710 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_11,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_11) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_11) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -534,9 +534,9 @@ class GVAR(dialog) { class Button_Backpack_Edit_12 : Button_Image { idc = IDC_BUTTON_EDIT_BACKPACK_12; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (750 / 1080) * SafeZoneH"; + y = "SafeZoneY + (750 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(IDC_BACKPACK_12,BACKPACK)] call LINKFUNC(setEditArea)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_12) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_EDIT_BACKPACK_12) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -546,26 +546,26 @@ class GVAR(dialog) { idc = IDC_EDITBOX_EQUIPMENT_NAME; tooltip = CSTRING(editbox_equipmentName_tooltip); x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (800 / 1080) * SafeZoneH"; + y = "SafeZoneY + (800 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Button_Save_Equipment : Button { idc = IDC_BUTTON_SAVE_EQUIPMENT; text = CSTRING(button_save_displayName); x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (800 / 1080) * SafeZoneH"; + y = "SafeZoneY + (800 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([(_this select 0)] call LINKFUNC(saveEquipment)); }; class Button_Delete_Equipment : Button_Image { idc = IDC_BUTTON_DELETE_EQUIPMENT; tooltip = CSTRING(button_deleteEquipment_tooltip); x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (800 / 1080) * SafeZoneH"; + y = "SafeZoneY + (800 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(((ctrlParent (_this select 0)) displayCtrl IDC_BUTTON_SAVE_EQUIPMENT),true)] call LINKFUNC(saveEquipment)); onMouseEnter = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_DELETE_EQUIPMENT) ctrlSetBackgroundColor [ARR_4(0,0,0,1)]); onMouseExit = QUOTE(((ctrlParent (_this select 0)) displayCtrl IDC_BACKGROUND_DELETE_EQUIPMENT) ctrlSetBackgroundColor [ARR_4(0,0,0,0.5)]); @@ -573,32 +573,32 @@ class GVAR(dialog) { class Dropdown_Medic : ListBox { idc = IDC_LISTBOX_MEDIC; x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (840 / 1080) * SafeZoneH"; + y = "SafeZoneY + (840 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(75 / 1080) * SafeZoneH"; + h = "(75 / 1080) * safeZoneH"; }; class Dropdown_Engineer : ListBox { idc = IDC_LISTBOX_ENGINEER; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (840 / 1080) * SafeZoneH"; + y = "SafeZoneY + (840 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(75 / 1080) * SafeZoneH"; + h = "(75 / 1080) * safeZoneH"; }; class Editbox_Editors : RscEdit { idc = IDC_EDITBOX_EDITORS; tooltip = CSTRING(editbox_editors); x = "SafeZoneX + (775 / 1920) * SafeZoneW"; - y = "SafeZoneY + (925 / 1080) * SafeZoneH"; + y = "SafeZoneY + (925 / 1080) * safeZoneH"; w = "(370 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Button_Save_Editors : Button { idc = IDC_BUTTON_SAVE_EDITORS; text = CSTRING(button_save_displayName); x = "SafeZoneX + (995 / 1920) * SafeZoneW"; - y = "SafeZoneY + (965 / 1080) * SafeZoneH"; + y = "SafeZoneY + (965 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([ARR_2(QQGVAR(updateEditors),[ARR_2(ctrlText IDC_TEXT_TITLE,ctrlText IDC_EDITBOX_EDITORS)])] call CBA_fnc_serverEvent); }; }; @@ -606,442 +606,442 @@ class GVAR(dialog) { class Background_1 : IGUIBack { idc = IDC_BACKGROUND_1; x = "SafeZoneX + (680 / 1920) * SafeZoneW"; - y = "SafeZoneY + (160 / 1080) * SafeZoneH"; + y = "SafeZoneY + (160 / 1080) * safeZoneH"; w = "(560 / 1920) * SafeZoneW"; - h = "(670 / 1080) * SafeZoneH"; + h = "(670 / 1080) * safeZoneH"; }; class Background_2 : IGUIBack { idc = IDC_BACKGROUND_2; x = "SafeZoneX + (690 / 1920) * SafeZoneW"; - y = "SafeZoneY + (170 / 1080) * SafeZoneH"; + y = "SafeZoneY + (170 / 1080) * safeZoneH"; w = "(540 / 1920) * SafeZoneW"; - h = "(650 / 1080) * SafeZoneH"; + h = "(650 / 1080) * safeZoneH"; }; // Header buttons ---------------------------------------- class Background_New_Equipment : Background_Image { idc = IDC_BACKGROUND_NEW_EQUIPMENT; x = "SafeZoneX + (1110 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Icon_New_Equipment : RscPicture { idc = IDC_ICON_NEW_EQUIPMENT; text = QPATHTOF(data\newCategory.paa); x = "SafeZoneX + (1114 / 1920) * SafeZoneW"; - y = "SafeZoneY + (184 / 1080) * SafeZoneH"; + y = "SafeZoneY + (184 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Background_settings : Background_Image { idc = IDC_BACKGROUND_SETTINGS; x = "SafeZoneX + (1150 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Icon_Settings : RscPicture { idc = IDC_ICON_SETTINGS; text = QPATHTOF(data\settings.paa); x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (185 / 1080) * SafeZoneH"; + y = "SafeZoneY + (185 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Background_Exit : Background_Image { idc = IDC_BACKGROUND_EXIT; x = "SafeZoneX + (1190 / 1920) * SafeZoneW"; - y = "SafeZoneY + (180 / 1080) * SafeZoneH"; + y = "SafeZoneY + (180 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Icon_Exit : RscPicture { idc = -1; text = QPATHTOF(data\exit.paa); x = "SafeZoneX + (1195 / 1920) * SafeZoneW"; - y = "SafeZoneY + (185 / 1080) * SafeZoneH"; + y = "SafeZoneY + (185 / 1080) * safeZoneH"; w = "(20 / 1920) * SafeZoneW"; - h = "(20 / 1080) * SafeZoneH"; + h = "(20 / 1080) * safeZoneH"; }; // Loadouts background configure buttons ---------------------------------------- class Background_Loadout_Edit_1 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_1; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (310 / 1080) * SafeZoneH"; + y = "SafeZoneY + (310 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_2 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_2; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (350 / 1080) * SafeZoneH"; + y = "SafeZoneY + (350 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_3 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_3; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (390 / 1080) * SafeZoneH"; + y = "SafeZoneY + (390 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_4 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_4; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (430 / 1080) * SafeZoneH"; + y = "SafeZoneY + (430 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_5 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_5; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (470 / 1080) * SafeZoneH"; + y = "SafeZoneY + (470 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_6 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_6; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (510 / 1080) * SafeZoneH"; + y = "SafeZoneY + (510 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_7 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_7; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (550 / 1080) * SafeZoneH"; + y = "SafeZoneY + (550 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_8 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_8; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (590 / 1080) * SafeZoneH"; + y = "SafeZoneY + (590 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_9 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_9; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (630 / 1080) * SafeZoneH"; + y = "SafeZoneY + (630 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_10 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_10; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (670 / 1080) * SafeZoneH"; + y = "SafeZoneY + (670 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_11 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_11; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (710 / 1080) * SafeZoneH"; + y = "SafeZoneY + (710 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Loadout_Edit_12 : Background_Image { idc = IDC_BACKGROUND_EDIT_LOADOUT_12; x = "SafeZoneX + (935 / 1920) * SafeZoneW"; - y = "SafeZoneY + (750 / 1080) * SafeZoneH"; + y = "SafeZoneY + (750 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; // Loadouts icon configure buttons ---------------------------------------- class Icon_Loadout_Edit_1 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_1; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (314 / 1080) * SafeZoneH"; + y = "SafeZoneY + (314 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_2 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_2; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (354 / 1080) * SafeZoneH"; + y = "SafeZoneY + (354 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_3 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_3; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (394 / 1080) * SafeZoneH"; + y = "SafeZoneY + (394 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_4 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_4; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (434 / 1080) * SafeZoneH"; + y = "SafeZoneY + (434 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_5 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_5; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (474 / 1080) * SafeZoneH"; + y = "SafeZoneY + (474 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_6 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_6; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (514 / 1080) * SafeZoneH"; + y = "SafeZoneY + (514 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_7 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_7; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (554 / 1080) * SafeZoneH"; + y = "SafeZoneY + (554 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_8 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_8; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (594 / 1080) * SafeZoneH"; + y = "SafeZoneY + (594 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_9 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_9; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (634 / 1080) * SafeZoneH"; + y = "SafeZoneY + (634 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_10 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_10; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (674 / 1080) * SafeZoneH"; + y = "SafeZoneY + (674 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_11 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_11; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (714 / 1080) * SafeZoneH"; + y = "SafeZoneY + (714 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Loadout_Edit_12 : RscPicture { idc = IDC_ICON_EDIT_LOADOUT_12; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (939 / 1920) * SafeZoneW"; - y = "SafeZoneY + (754 / 1080) * SafeZoneH"; + y = "SafeZoneY + (754 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; // Backpack background configure buttons ---------------------------------------- class Background_Backpack_Edit_1 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_1; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (310 / 1080) * SafeZoneH"; + y = "SafeZoneY + (310 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_2 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_2; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (350 / 1080) * SafeZoneH"; + y = "SafeZoneY + (350 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_3 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_3; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (390 / 1080) * SafeZoneH"; + y = "SafeZoneY + (390 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_4 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_4; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (430 / 1080) * SafeZoneH"; + y = "SafeZoneY + (430 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_5 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_5; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (470 / 1080) * SafeZoneH"; + y = "SafeZoneY + (470 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_6 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_6; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (510 / 1080) * SafeZoneH"; + y = "SafeZoneY + (510 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_7 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_7; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (550 / 1080) * SafeZoneH"; + y = "SafeZoneY + (550 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_8 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_8; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (590 / 1080) * SafeZoneH"; + y = "SafeZoneY + (590 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_9 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_9; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (630 / 1080) * SafeZoneH"; + y = "SafeZoneY + (630 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_10 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_10; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (670 / 1080) * SafeZoneH"; + y = "SafeZoneY + (670 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_11 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_11; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (710 / 1080) * SafeZoneH"; + y = "SafeZoneY + (710 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Background_Backpack_Edit_12 : Background_Image { idc = IDC_BACKGROUND_EDIT_BACKPACK_12; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (750 / 1080) * SafeZoneH"; + y = "SafeZoneY + (750 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; // Backpacks icon configure buttons ---------------------------------------- class Icon_Backpack_Edit_1 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_1; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (314 / 1080) * SafeZoneH"; + y = "SafeZoneY + (314 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_2 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_2; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (354 / 1080) * SafeZoneH"; + y = "SafeZoneY + (354 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_3 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_3; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (394 / 1080) * SafeZoneH"; + y = "SafeZoneY + (394 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_4 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_4; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (434 / 1080) * SafeZoneH"; + y = "SafeZoneY + (434 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_5 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_5; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (474 / 1080) * SafeZoneH"; + y = "SafeZoneY + (474 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_6 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_6; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (514 / 1080) * SafeZoneH"; + y = "SafeZoneY + (514 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_7 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_7; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (554 / 1080) * SafeZoneH"; + y = "SafeZoneY + (554 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_8 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_8; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (594 / 1080) * SafeZoneH"; + y = "SafeZoneY + (594 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_9 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_9; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (634 / 1080) * SafeZoneH"; + y = "SafeZoneY + (634 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_10 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_10; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (674 / 1080) * SafeZoneH"; + y = "SafeZoneY + (674 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_11 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_11; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (714 / 1080) * SafeZoneH"; + y = "SafeZoneY + (714 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; class Icon_Backpack_Edit_12 : RscPicture { idc = IDC_ICON_EDIT_BACKPACK_12; text = QPATHTOF(data\edit.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (754 / 1080) * SafeZoneH"; + y = "SafeZoneY + (754 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; // Footer settings ---------------------------------------- class Background_Delete_Equipment : Background_Image { idc = IDC_BACKGROUND_DELETE_EQUIPMENT; x = "SafeZoneX + (1155 / 1920) * SafeZoneW"; - y = "SafeZoneY + (800 / 1080) * SafeZoneH"; + y = "SafeZoneY + (800 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Icon_Delete_Equipment : RscPicture { idc = IDC_ICON_DELETE_EQUIPMENT; text = QPATHTOF(data\delete.paa); x = "SafeZoneX + (1159 / 1920) * SafeZoneW"; - y = "SafeZoneY + (804 / 1080) * SafeZoneH"; + y = "SafeZoneY + (804 / 1080) * safeZoneH"; w = "(22 / 1920) * SafeZoneW"; - h = "(22 / 1080) * SafeZoneH"; + h = "(22 / 1080) * safeZoneH"; }; }; }; @@ -1057,25 +1057,25 @@ class GVAR(newEquipment) { idc = IDC_EDITBOX_EQUIPMENT; tooltip = CSTRING(editbox_equipmentName_tooltip); x = "SafeZoneX + (720 / 1920) * SafeZoneW"; - y = "SafeZoneY + (525 / 1080) * SafeZoneH"; + y = "SafeZoneY + (525 / 1080) * safeZoneH"; w = "(280 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Checkbox_Initialize_Equipment : RscCheckBox { idc = IDC_CHECKBOX_EQUIPMENT; tooltip = CSTRING(checkbox_initializeEquipmentCategory_tooltip); x = "SafeZoneX + (1010 / 1920) * SafeZoneW"; - y = "SafeZoneY + (525 / 1080) * SafeZoneH"; + y = "SafeZoneY + (525 / 1080) * safeZoneH"; w = "(30 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; }; class Button_Create_Equipment : Button { idc = IDC_BUTTON_CREATE; text = CSTRING(button_createEquipmentCategory_displayName); x = "SafeZoneX + (1050 / 1920) * SafeZoneW"; - y = "SafeZoneY + (525 / 1080) * SafeZoneH"; + y = "SafeZoneY + (525 / 1080) * safeZoneH"; w = "(150 / 1920) * SafeZoneW"; - h = "(30 / 1080) * SafeZoneH"; + h = "(30 / 1080) * safeZoneH"; onButtonClick = QUOTE([_this select 0] call LINKFUNC(buttonCreateEquipment)); }; }; @@ -1083,9 +1083,9 @@ class GVAR(newEquipment) { class Background : IGUIBack { idc = -1; x = "SafeZoneX + (710 / 1920) * SafeZoneW"; - y = "SafeZoneY + (515 / 1080) * SafeZoneH"; + y = "SafeZoneY + (515 / 1080) * safeZoneH"; w = "(500 / 1920) * SafeZoneW"; - h = "(50 / 1080) * SafeZoneH"; + h = "(50 / 1080) * safeZoneH"; }; }; }; diff --git a/addons/common/functions/fnc_addChatCommands.sqf b/addons/common/functions/fnc_addChatCommands.sqf index b49481f..a06898d 100644 --- a/addons/common/functions/fnc_addChatCommands.sqf +++ b/addons/common/functions/fnc_addChatCommands.sqf @@ -30,7 +30,7 @@ if (isServer) then { }] call CBA_fnc_addEventHandler; }; -CHECK(!hasinterface); +CHECK(!hasInterface); ["zeus", { params ["_name"]; @@ -180,7 +180,7 @@ CHECK(!hasinterface); params ["_names"]; private _units = []; - CHECKRET(_names isEqualTo "", systemchat LLSTRING(chatCommands_falseArgument)); + CHECKRET(_names isEqualTo "",systemChat LLSTRING(chatCommands_falseArgument)); _names = _names splitString "~"; private _count = { @@ -189,7 +189,7 @@ CHECK(!hasinterface); } count _names; if (objNull in _units) exitWith { - systemchat LLSTRING(chatCommands_falseArgument); + systemChat LLSTRING(chatCommands_falseArgument); }; if (_count isEqualTo 1) then { @@ -200,7 +200,7 @@ CHECK(!hasinterface); private _vehicle = objectParent _unitA; if (!isNull _vehicle && {speed _vehicle > 1} && {((getPos _vehicle) select 2) > 2}) exitWith { - systemchat LLSTRING(chatCommands_teleportError); + systemChat LLSTRING(chatCommands_teleportError); }; if (!isNull _vehicle) then { [_unitA, ["Eject", _vehicle]] remoteExecCall ["action", _unitA]; @@ -215,7 +215,7 @@ CHECK(!hasinterface); _unitA setPos (_unitB getRelPos [-1, 0]); } else { private _moveInAnyResult = _unitA moveInAny _vehicle; - if (!_moveInAnyResult) exitWith {systemchat LLSTRING(chatCommands_teleportError);}; + if (!_moveInAnyResult) exitWith {systemChat LLSTRING(chatCommands_teleportError);}; }; }, _units, 0.5] call CBA_fnc_waitAndExecute; }, "adminLogged"] call CBA_fnc_registerChatCommand; diff --git a/addons/common/functions/fnc_areModsLoaded.sqf b/addons/common/functions/fnc_areModsLoaded.sqf index 35df9a0..4f329fd 100644 --- a/addons/common/functions/fnc_areModsLoaded.sqf +++ b/addons/common/functions/fnc_areModsLoaded.sqf @@ -19,6 +19,6 @@ params [["_mods", [], [[]]]]; -CHECKRET(_mods isEqualTo [], false); +CHECKRET(_mods isEqualTo [],false); (_mods findIf {!isClass (configFile >> "CfgPatches" >> _x)}) isEqualTo -1 diff --git a/addons/common/functions/fnc_arsenalPBWFix.sqf b/addons/common/functions/fnc_arsenalPBWFix.sqf index 39eaf3c..c666f29 100644 --- a/addons/common/functions/fnc_arsenalPBWFix.sqf +++ b/addons/common/functions/fnc_arsenalPBWFix.sqf @@ -16,6 +16,6 @@ * */ -CHECK(!([["PBW_German_Uniform"]] call FUNC(areModsLoaded)) || !hasinterface); +CHECK(!([["PBW_German_Uniform"]] call FUNC(areModsLoaded)) || !hasInterface); -["ace_arsenal_displayClosed", {execvm "german_common\scripts\ranks\getKlappen.sqf"}] call CBA_fnc_addEventhandler; //for gods sake execvm :( +["ace_arsenal_displayClosed", {execVM "german_common\scripts\ranks\getKlappen.sqf"}] call CBA_fnc_addEventhandler; //for gods sake execVM :( diff --git a/addons/cords/functions/fnc_addCordsToACE.sqf b/addons/cords/functions/fnc_addCordsToACE.sqf index df3a33f..2d423e0 100644 --- a/addons/cords/functions/fnc_addCordsToACE.sqf +++ b/addons/cords/functions/fnc_addCordsToACE.sqf @@ -16,7 +16,7 @@ * */ -CHECK(!GVAR(enabled) || !hasinterface); +CHECK(!GVAR(enabled) || !hasInterface); private _cordCondition = {(uniform ACE_player) in ["PBW_Uniform1_fleck","PBW_Uniform1H_fleck","PBW_Uniform1_tropen","PBW_Uniform1H_tropen","PBW_Uniform2_fleck","PBW_Uniform2_tropen","PBW_Uniform3K_fleck","PBW_Uniform3K_tropen","PBW_Uniform3_fleck","PBW_Uniform3_tropen","PBW_Uniform4K_fleck","PBW_Uniform4K_tropen","PBW_Uniform4_fleck","PBW_Uniform4_tropen"]}; diff --git a/addons/cords/functions/fnc_addMajorToACE.sqf b/addons/cords/functions/fnc_addMajorToACE.sqf index 38038b3..132e866 100644 --- a/addons/cords/functions/fnc_addMajorToACE.sqf +++ b/addons/cords/functions/fnc_addMajorToACE.sqf @@ -18,11 +18,11 @@ * */ -CHECK(!hasinterface); +CHECK(!hasInterface); private _playerIDs = parseSimpleArray GVAR(playerIDs); -CHECKRET(!(_playerIDs isEqualType []), ERROR("Wrong data type in CBA Settings. Expected ARRAY of STRINGS with player IDs")); +CHECKRET(!(_playerIDs isEqualType []),ERROR("Wrong data type in CBA Settings. Expected ARRAY of STRINGS with player IDs")); CHECK(!((getPlayerUID ACE_player) in _playerIDs)); diff --git a/addons/cutter/XEH_postInit.sqf b/addons/cutter/XEH_postInit.sqf index 75c1583..8cfeaae 100644 --- a/addons/cutter/XEH_postInit.sqf +++ b/addons/cutter/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -CHECK(!hasinterface); +CHECK(!hasInterface); private _cfgWeapons = configFile >> "CfgWeapons"; private _itemsAbleToCutBushes = (call (uiNamespace getVariable [QGVAR(itemsAbleToCutBushes), {[]}])) apply {_cfgWeapons >> _x}; diff --git a/addons/cutter/XEH_preStart.sqf b/addons/cutter/XEH_preStart.sqf index 098a70a..38ba91a 100644 --- a/addons/cutter/XEH_preStart.sqf +++ b/addons/cutter/XEH_preStart.sqf @@ -2,5 +2,5 @@ #include "XEH_PREP.hpp" -private _itemsAbleToCutBushes = (configProperties [configfile >> "CfgWeapons", QUOTE(isClass _x && {(getNumber (_x >> QQGVAR(canCutBushes))) isEqualTo 1}), true]) apply {configName _x}; +private _itemsAbleToCutBushes = (configProperties [configFile >> "CfgWeapons", QUOTE(isClass _x && {(getNumber (_x >> QQGVAR(canCutBushes))) isEqualTo 1}), true]) apply {configName _x}; uiNamespace setVariable [QGVAR(itemsAbleToCutBushes), compileFinal str _itemsAbleToCutBushes]; diff --git a/addons/cutter/functions/fnc_addBushCutter.sqf b/addons/cutter/functions/fnc_addBushCutter.sqf index 99f0dec..b0c2ff3 100644 --- a/addons/cutter/functions/fnc_addBushCutter.sqf +++ b/addons/cutter/functions/fnc_addBushCutter.sqf @@ -16,7 +16,7 @@ * */ -CHECK(!hasinterface); +CHECK(!hasInterface); #define SOUND_DISTANCE 30 #define SOUND_VOLUME 5 diff --git a/addons/cutter/functions/fnc_addGrassCutter.sqf b/addons/cutter/functions/fnc_addGrassCutter.sqf index da257ee..ce44f06 100644 --- a/addons/cutter/functions/fnc_addGrassCutter.sqf +++ b/addons/cutter/functions/fnc_addGrassCutter.sqf @@ -16,7 +16,7 @@ * */ -CHECK(!hasinterface); +CHECK(!hasInterface); private _action = [ QGVAR(grasscutter), diff --git a/addons/cutter/functions/fnc_canCutBush.sqf b/addons/cutter/functions/fnc_canCutBush.sqf index bf9c1d9..e229195 100644 --- a/addons/cutter/functions/fnc_canCutBush.sqf +++ b/addons/cutter/functions/fnc_canCutBush.sqf @@ -19,8 +19,8 @@ params ["_player", ["_maxDistance", 5, [0]]]; -if (!GVAR(bushcutter_enabled)) exitwith {false}; -if (!([_player, objNull] call ace_common_fnc_canInteractWith)) exitwith {false}; +if (!GVAR(bushcutter_enabled)) exitWith {false}; +if (!([_player, objNull] call ace_common_fnc_canInteractWith)) exitWith {false}; private _hasItem = if (GVAR(bushcutter_requireItem)) then { count (([_player] call ace_common_fnc_uniqueItems) arrayIntersect keys GVAR(bushCutterCache)) > 0 diff --git a/addons/cutter/functions/fnc_seesBush.sqf b/addons/cutter/functions/fnc_seesBush.sqf index a5b91f4..b7c40c8 100644 --- a/addons/cutter/functions/fnc_seesBush.sqf +++ b/addons/cutter/functions/fnc_seesBush.sqf @@ -20,7 +20,7 @@ params ["_player", ["_maxDistance", 5, [0]]]; private _startPosASL = eyePos _player; -private _endPosASL = _startPosASL vectoradd (getCameraViewDirection _player vectorMultiply _maxDistance); +private _endPosASL = _startPosASL vectorAdd (getCameraViewDirection _player vectorMultiply _maxDistance); private _intersections = lineIntersectsSurfaces [_startPosASL, _endPosASL, _player, objNull, true, 1, "VIEW"]; diff --git a/addons/database/functions/fnc_connectToDB.sqf b/addons/database/functions/fnc_connectToDB.sqf index 9144785..43a64f9 100644 --- a/addons/database/functions/fnc_connectToDB.sqf +++ b/addons/database/functions/fnc_connectToDB.sqf @@ -25,7 +25,7 @@ params [ CHECKRET(!isServer,[false]); private _result = "extdb3" callExtension "9:VERSION"; -If (_result isEqualTo "") exitWith { +if (_result isEqualTo "") exitWith { ERROR("No extDB3 extension loaded"); [false]; }; @@ -37,41 +37,41 @@ if (!GVAR(initialized)) then { }; if ([toLower _database, toLower _protocol] in GVAR(connections)) exitWith { - ERROR(format [ARR_3("The database '%1' and protocol '%2' are already initialized", _database, _protocol)]); + ERROR_2("The database '%1' and protocol '%2' are already initialized",_database,_protocol); [false]; }; _result = parseSimpleArray ("extdb3" callExtension "9:LOCK_STATUS"); -If ((_result select 0) == 1) exitWith { +if ((_result select 0) == 1) exitWith { ERROR("Communication to database is locked"); [false]; }; _result = parseSimpleArray ("extdb3" callExtension format ["9:ADD_DATABASE:%1", _database]); -If ((_result select 0) isEqualTo 0) exitWith { - ERROR(format [ARR_2("Cannot connect to database '%1'", _database)]); +if ((_result select 0) isEqualTo 0) exitWith { + ERROR_1("Cannot connect to database '%1'",_database); [false]; }; -INFO(format [ARR_2("Connected to database '%1'", _database)]); +INFO_1("Connected to database '%1'",_database); // Security private _sessionID = round(random(999999)); while {_sessionID in GVAR(sessionIDs)} do { _sessionID = round(random(999999)); }; -TRACE_1("Current session ID", _sessionID); +TRACE_1("Current session ID",_sessionID); _result = parseSimpleArray ("extdb3" callExtension (format["9:ADD_DATABASE_PROTOCOL:%1:SQL_CUSTOM:%2:%3", _database, _sessionID, _protocol])); -If !((_result select 0) isEqualTo 1) exitWith { - ERROR(format [ARR_2("Protocol '%1' not loaded", _protocol)]); +if ((_result select 0) isNotEqualTo 1) exitWith { + ERROR_1("Protocol '%1' not loaded",_protocol); [false]; }; -INFO(format [ARR_2("Protocol '%1' loaded", _protocol)]); +INFO_1("Protocol '%1' loaded",_protocol); GVAR(connections) pushBackUnique [toLower _database, toLower _protocol]; GVAR(sessionIDs) pushBackUnique _sessionID; -TRACE_2("", GVAR(connections), GVAR(sessionIDs)); +TRACE_2("",GVAR(connections),GVAR(sessionIDs)); GVAR(initialized) = true; [true, _sessionID]; diff --git a/addons/database/functions/fnc_getData.sqf b/addons/database/functions/fnc_getData.sqf index 0bcc9a9..9e94520 100644 --- a/addons/database/functions/fnc_getData.sqf +++ b/addons/database/functions/fnc_getData.sqf @@ -27,7 +27,7 @@ _query = _query joinString ":"; private _return = parseSimpleArray ("extdb3" callExtension _query); switch (_return select 0) do { - case 0 : {ERROR(format[ARR_2("Database Error: %1",(_return select 1))]);}; + case 0 : {ERROR_1("Database Error: %1",(_return select 1));}; case 2 : {_return = (_return select 1) call FUNC(multiMsg);}; }; (_return select 1); diff --git a/addons/database/functions/fnc_multiMsg.sqf b/addons/database/functions/fnc_multiMsg.sqf index 163e4ba..2f48912 100644 --- a/addons/database/functions/fnc_multiMsg.sqf +++ b/addons/database/functions/fnc_multiMsg.sqf @@ -25,7 +25,7 @@ private _return = ""; private "_pipe"; while {true} do { _pipe = "extdb3" callExtension format["5:%1",_key]; - If (_pipe isEqualTo "") exitWith {}; + if (_pipe isEqualTo "") exitWith {}; _return = _return + _pipe; }; parseSimpleArray _return; diff --git a/addons/drill/XEH_postInit.sqf b/addons/drill/XEH_postInit.sqf index dfd1e1a..2cbb728 100644 --- a/addons/drill/XEH_postInit.sqf +++ b/addons/drill/XEH_postInit.sqf @@ -1,5 +1,3 @@ #include "script_component.hpp" -CHECK(!hasinterface); - #include "initKeybinds.hpp" diff --git a/addons/drill/functions/fnc_playAnimation.sqf b/addons/drill/functions/fnc_playAnimation.sqf index 15e66f6..57ba3f5 100644 --- a/addons/drill/functions/fnc_playAnimation.sqf +++ b/addons/drill/functions/fnc_playAnimation.sqf @@ -6,7 +6,7 @@ * Executes given animation. * * Parameter(s): - * 0: STRING - Animation name + * 0: STRING - Animation name. ("mts_drill_StandStill", "mts_drill_AtEase", "mts_drill_Salute", or "mts_drill_FY") * * Returns: * Nothing @@ -16,98 +16,104 @@ * */ -params ["_animName"]; +params [["_animName", "", [""]]]; + +private _player = call CBA_fnc_currentUnit; +private _currAnimState = animationState _player; +private _animationSequence = []; -private _currAnimState = animationState ACE_player; -private _doAnimation = ""; -private _doAnimationTwo = ""; TRACE_2("",_animName,_currAnimState); if (_animName isEqualTo QGVAR(StandStill)) then { if (_currAnimState == "AmovPercMstpSnonWnonDnon") then { - _doAnimation = QGVAR(AmovPercMstpSnonWnonDnon_StandStill); + _animationSequence = [QGVAR(AmovPercMstpSnonWnonDnon_StandStill), QGVAR(StandStill)]; + if (GVAR(UIEnabled)) then { - cutRsc [QGVAR(StandStill),"PLAIN"]; + cutRsc [QGVAR(StandStill), "PLAIN"]; }; - }; + }; if (_currAnimState == QGVAR(StandStill)) then { - _doAnimation = QGVAR(StandStill_AmovPercMstpSnonWnonDnon); + _animationSequence = [QGVAR(StandStill_AmovPercMstpSnonWnonDnon)]; + if (GVAR(UIEnabled)) then { cutText ["", "PLAIN"]; }; }; if (_currAnimState == QGVAR(AtEase)) then { - _doAnimation = QGVAR(AtEase_StandStill); + _animationSequence = [QGVAR(AtEase_StandStill), QGVAR(StandStill)]; + if (GVAR(UIEnabled)) then { cutText ["", "PLAIN"]; - cutRsc [QGVAR(StandStill),"PLAIN"]; + cutRsc [QGVAR(StandStill), "PLAIN"]; }; }; if (_currAnimState == "AmovPercMstpSnonWnonDnon_Salute") then { - _doAnimation = "AmovPercMstpSnonWnonDnon_SaluteOut"; - _doAnimationTwo = QGVAR(AmovPercMstpSnonWnonDnon_StandStill); + _animationSequence = ["AmovPercMstpSnonWnonDnon_SaluteOut", QGVAR(AmovPercMstpSnonWnonDnon_StandStill), QGVAR(StandStill)]; + if (GVAR(UIEnabled)) then { - cutRsc [QGVAR(StandStill),"PLAIN"]; + cutRsc [QGVAR(StandStill), "PLAIN"]; }; }; }; if (_animName isEqualTo QGVAR(AtEase)) then { if (_currAnimState == "AmovPercMstpSnonWnonDnon") then { - _doAnimation = QGVAR(AmovPercMstpSnonWnonDnon_AtEase); + _animationSequence = [QGVAR(AmovPercMstpSnonWnonDnon_AtEase), QGVAR(AtEase)]; + if (GVAR(UIEnabled)) then { - cutRsc [QGVAR(AtEase),"PLAIN"]; + cutRsc [QGVAR(AtEase), "PLAIN"]; }; }; if (_currAnimState == QGVAR(AtEase)) then { - _doAnimation = QGVAR(AtEase_AmovPercMstpSnonWnonDnon); + _animationSequence = [QGVAR(AtEase_AmovPercMstpSnonWnonDnon)]; + if (GVAR(UIEnabled)) then { cutText ["", "PLAIN"]; }; }; if (_currAnimState == QGVAR(StandStill)) then { - _doAnimation = QGVAR(StandStill_AtEase); + _animationSequence = [QGVAR(StandStill_AtEase), QGVAR(AtEase)]; + if (GVAR(UIEnabled)) then { cutText ["", "PLAIN"]; - cutRsc [QGVAR(AtEase),"PLAIN"]; + cutRsc [QGVAR(AtEase), "PLAIN"]; }; }; if (_currAnimState == "AmovPercMstpSnonWnonDnon_Salute") then { - _doAnimation = "AmovPercMstpSnonWnonDnon_SaluteOut"; - _doAnimationTwo = QGVAR(AmovPercMstpSnonWnonDnon_AtEase); + _animationSequence = ["AmovPercMstpSnonWnonDnon_SaluteOut", QGVAR(AmovPercMstpSnonWnonDnon_AtEase), QGVAR(AtEase)]; + if (GVAR(UIEnabled)) then { - cutRsc [QGVAR(AtEase),"PLAIN"]; + cutRsc [QGVAR(AtEase), "PLAIN"]; }; }; }; if (_animName isEqualTo QGVAR(FY)) then { if (_currAnimState == "AmovPercMstpSnonWnonDnon") then { - _doAnimation = QGVAR(FY)}; + _animationSequence = [QGVAR(FY)]; + }; }; if (_animName isEqualTo QGVAR(Salute)) then { if (_currAnimState == QGVAR(StandStill)) then { - _doAnimation = QGVAR(StandStill_AmovPercMstpSnonWnonDnon); - _doAnimationTwo = "AmovPercMstpSnonWnonDnon_SaluteIn"; + _animationSequence = [QGVAR(StandStill_AmovPercMstpSnonWnonDnon), "AmovPercMstpSnonWnonDnon_SaluteIn"]; + if (GVAR(UIEnabled)) then { cutText ["", "PLAIN"]; }; }; if (_currAnimState == QGVAR(AtEase)) then { - _doAnimation = QGVAR(StandStill_AmovPercMstpSnonWnonDnon); - _doAnimationTwo = "AmovPercMstpSnonWnonDnon_SaluteIn"; + _animationSequence = [QGVAR(AtEase_AmovPercMstpSnonWnonDnon), "AmovPercMstpSnonWnonDnon_SaluteIn"]; + if (GVAR(UIEnabled)) then { cutText ["", "PLAIN"]; }; }; }; +TRACE_1("Animation Sequence",_animationSequence); -if (_doAnimation isNotEqualTo "") then { - [ACE_player, _doAnimation, 2] call ace_common_fnc_doAnimation; -}; - -if (_doAnimationTwo isNotEqualTo "") then { - [ACE_player, _doAnimationTwo, 0] call ace_common_fnc_doAnimation; -}; +{ + // First entry is played with switchmove, other with playmove + [_player, _x, [0, 2] select (_forEachIndex isEqualTo 0)] call ace_common_fnc_doAnimation; +} forEach _animationSequence; diff --git a/addons/drill/initKeybinds.hpp b/addons/drill/initKeybinds.hpp index 502bcda..8e69504 100644 --- a/addons/drill/initKeybinds.hpp +++ b/addons/drill/initKeybinds.hpp @@ -1,3 +1,5 @@ +CHECK(!hasInterface); + [ [LELSTRING(main,category), LLSTRING(subCategory)], QGVAR(StandStill_keybind), @@ -32,7 +34,7 @@ private _actionKeys = []; { if (((str _x) find ".") isEqualTo -1) then { - _actionKeys pushback _x; + _actionKeys pushBack _x; }; } forEach actionKeys "Salute"; TRACE_1("Salute Keys",_actionKeys); diff --git a/addons/drill/stringtable.xml b/addons/drill/stringtable.xml index 501cf0f..141ed6a 100644 --- a/addons/drill/stringtable.xml +++ b/addons/drill/stringtable.xml @@ -18,15 +18,15 @@ Rührt euch - Give the Finger + Give the finger Stinkefinger zeigen - Show Drill stance indicator + Show drill stance indicator Zeige Formaldienst Haltungsindikator - Show Drill stance indicator in bottom right corner. + Show drill stance indicator in bottom right corner. Zeigt die Haltung für den Formaldienst unten rechts. diff --git a/addons/drill/ui/RscAttributes.hpp b/addons/drill/ui/RscAttributes.hpp index 436d006..86e4f74 100644 --- a/addons/drill/ui/RscAttributes.hpp +++ b/addons/drill/ui/RscAttributes.hpp @@ -10,9 +10,9 @@ class RscTitles { idc = -1; text = QPATHTOF(ui\mts_StandStill.paa); x = "SafeZoneX + (1792 / 1920) * SafeZoneW"; - y = "SafeZoneY + (952 / 1080) * SafeZoneH"; + y = "SafeZoneY + (952 / 1080) * safeZoneH"; w = "(128 / 1920) * SafeZoneW"; - h = "(128 / 1080) * SafeZoneH"; + h = "(128 / 1080) * safeZoneH"; }; }; class controlsBackground { @@ -20,9 +20,9 @@ class RscTitles { idc = -1; colorBackground[] = {0, 0, 0, 0.3}; x = "SafeZoneX + (1792 / 1920) * SafeZoneW"; - y = "SafeZoneY + (952 / 1080) * SafeZoneH"; + y = "SafeZoneY + (952 / 1080) * safeZoneH"; w = "(128 / 1920) * SafeZoneW"; - h = "(128 / 1080) * SafeZoneH"; + h = "(128 / 1080) * safeZoneH"; }; }; }; @@ -35,9 +35,9 @@ class RscTitles { idc = -1; text = QPATHTOF(ui\mts_AtEase.paa); x = "SafeZoneX + (1792 / 1920) * SafeZoneW"; - y = "SafeZoneY + (952 / 1080) * SafeZoneH"; + y = "SafeZoneY + (952 / 1080) * safeZoneH"; w = "(128 / 1920) * SafeZoneW"; - h = "(128 / 1080) * SafeZoneH"; + h = "(128 / 1080) * safeZoneH"; }; }; class controlsBackground { @@ -45,9 +45,9 @@ class RscTitles { idc = -1; colorBackground[] = {0, 0, 0, 0.3}; x = "SafeZoneX + (1792 / 1920) * SafeZoneW"; - y = "SafeZoneY + (952 / 1080) * SafeZoneH"; + y = "SafeZoneY + (952 / 1080) * safeZoneH"; w = "(128 / 1920) * SafeZoneW"; - h = "(128 / 1080) * SafeZoneH"; + h = "(128 / 1080) * safeZoneH"; }; }; }; diff --git a/addons/engineer/functions/fnc_addIgniteMiclicAction.sqf b/addons/engineer/functions/fnc_addIgniteMiclicAction.sqf index 8a2b0b2..89bfc1c 100644 --- a/addons/engineer/functions/fnc_addIgniteMiclicAction.sqf +++ b/addons/engineer/functions/fnc_addIgniteMiclicAction.sqf @@ -16,8 +16,10 @@ * */ -#define ACTION_DURATION 3 // Seconds -#define ACTION_RANGE 2 // Meters +// Duration in Seconds +#define ACTION_DURATION 3 +// Range in Meters +#define ACTION_RANGE 2 params ["_miclic"]; diff --git a/addons/engineer/functions/fnc_igniteMiclic.sqf b/addons/engineer/functions/fnc_igniteMiclic.sqf index d96d8d3..fe9eddf 100644 --- a/addons/engineer/functions/fnc_igniteMiclic.sqf +++ b/addons/engineer/functions/fnc_igniteMiclic.sqf @@ -33,7 +33,7 @@ params [ CHECK(!isServer); // Param checks -CHECKRET(isNull _miclic, ERROR("Given miclic object does not exist.")); +CHECKRET(isNull _miclic,ERROR("Given miclic object does not exist.")); if (_effectiveClearingDistance <= 0) then { WARNING("Effective clearing distance must be greater 0. Using default value."); _effectiveClearingDistance = DEFAULT_CLEARING_DISTANCE; diff --git a/addons/flags/XEH_postInit.sqf b/addons/flags/XEH_postInit.sqf index 545ff58..8cfa0e8 100644 --- a/addons/flags/XEH_postInit.sqf +++ b/addons/flags/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -CHECK(!hasinterface); +CHECK(!hasInterface); GVAR(isPlacing) = PLACE_CANCEL; ["ace_interactMenuOpened", {GVAR(isPlacing) = PLACE_CANCEL;}] call CBA_fnc_addEventHandler; diff --git a/addons/flags/XEH_preStart.sqf b/addons/flags/XEH_preStart.sqf index 8b172c6..c70b253 100644 --- a/addons/flags/XEH_preStart.sqf +++ b/addons/flags/XEH_preStart.sqf @@ -2,5 +2,5 @@ #include "XEH_PREP.hpp" -private _flagItems = (configProperties [configfile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(texture))}), true]) apply {configName _x}; +private _flagItems = (configProperties [configFile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(texture))}), true]) apply {configName _x}; uiNamespace setVariable [QGVAR(allFlagItems), compileFinal str _flagItems]; diff --git a/addons/flags/functions/fnc_carryFlag.sqf b/addons/flags/functions/fnc_carryFlag.sqf index 58af100..c0b6451 100644 --- a/addons/flags/functions/fnc_carryFlag.sqf +++ b/addons/flags/functions/fnc_carryFlag.sqf @@ -18,7 +18,7 @@ */ params ["_unit", "_item"]; -TRACE_2("Carry flag", _unit, _item); +TRACE_2("Carry flag",_unit,_item); (GVAR(flagItemCache) get _item) params ["", "_texture"]; _unit forceFlagTexture _texture; diff --git a/addons/flags/functions/fnc_pickupFlag.sqf b/addons/flags/functions/fnc_pickupFlag.sqf index 71f0243..a87923d 100644 --- a/addons/flags/functions/fnc_pickupFlag.sqf +++ b/addons/flags/functions/fnc_pickupFlag.sqf @@ -19,7 +19,7 @@ */ params ["_unit", "_item", "_flag"]; -TRACE_3("Flag pickup", _unit, _item, _flag); +TRACE_3("Flag pickup",_unit,_item,_flag); [_unit, "PutDown"] call ace_common_fnc_doGesture; diff --git a/addons/flags/functions/fnc_placeFlag.sqf b/addons/flags/functions/fnc_placeFlag.sqf index ab83505..18cd474 100644 --- a/addons/flags/functions/fnc_placeFlag.sqf +++ b/addons/flags/functions/fnc_placeFlag.sqf @@ -19,7 +19,7 @@ */ params ["_player", "_item"]; -TRACE_2("Placing flag", _player, _item); +TRACE_2("Placing flag",_player,_item); private _flag = "FlagChecked_F" createVehicle [0, 0, 0]; diff --git a/addons/items/XEH_missionDisplayLoad.sqf b/addons/items/XEH_missionDisplayLoad.sqf index 3b2b097..f0bfb3f 100644 --- a/addons/items/XEH_missionDisplayLoad.sqf +++ b/addons/items/XEH_missionDisplayLoad.sqf @@ -11,7 +11,7 @@ _display displayAddEventHandler ["MouseZChanged", { _display displayAddEventHandler ["MouseButtonDown", { params ["", "_button"]; - CHECKRET(GVAR(isPlacing) isNotEqualTo PLACE_WAITING, false); - CHECKRET(_button isNotEqualTo 1, false); //1 = Left mouse button + CHECKRET(GVAR(isPlacing) isNotEqualTo PLACE_WAITING,false); + CHECKRET(_button isNotEqualTo 1,false); //1 = Left mouse button GVAR(isPlacing) = PLACE_CANCEL; }]; diff --git a/addons/items/XEH_postInit.sqf b/addons/items/XEH_postInit.sqf index b3f755c..fe24bcd 100644 --- a/addons/items/XEH_postInit.sqf +++ b/addons/items/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -CHECK(!hasinterface); +CHECK(!hasInterface); GVAR(isPlacing) = PLACE_CANCEL; ["ace_interactMenuOpened", {GVAR(isPlacing) = PLACE_CANCEL;}] call CBA_fnc_addEventHandler; diff --git a/addons/items/XEH_preStart.sqf b/addons/items/XEH_preStart.sqf index ef7432b..1ac6c2a 100644 --- a/addons/items/XEH_preStart.sqf +++ b/addons/items/XEH_preStart.sqf @@ -2,5 +2,5 @@ #include "XEH_PREP.hpp" -private _weapons = (configProperties [configfile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(vehicle))}), true]) apply {configName _x}; +private _weapons = (configProperties [configFile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(vehicle))}), true]) apply {configName _x}; uiNamespace setVariable [QGVAR(markerItems), compileFinal str _weapons]; diff --git a/addons/items/functions/fnc_handleScrollWheel.sqf b/addons/items/functions/fnc_handleScrollWheel.sqf index 314af1e..556bf47 100644 --- a/addons/items/functions/fnc_handleScrollWheel.sqf +++ b/addons/items/functions/fnc_handleScrollWheel.sqf @@ -18,7 +18,7 @@ params ["_scrollAmount"]; -CHECKRET(GVAR(isPlacing) isNotEqualTo PLACE_WAITING, false); +CHECKRET(GVAR(isPlacing) isNotEqualTo PLACE_WAITING,false); //move object height 10cm per scroll GVAR(objectHeight) = GVAR(objectHeight) + (_scrollAmount * 0.1); diff --git a/addons/items/functions/fnc_placeMarker.sqf b/addons/items/functions/fnc_placeMarker.sqf index b5be01a..6db47a0 100644 --- a/addons/items/functions/fnc_placeMarker.sqf +++ b/addons/items/functions/fnc_placeMarker.sqf @@ -19,7 +19,7 @@ */ params [["_player", objNull, [objNull]], ["_item", "", [""]]]; -TRACE_2("Placing marker", _player, _item); +TRACE_2("Placing marker",_player,_item); CHECK(_item isEqualTo ""); @@ -27,7 +27,7 @@ CHECK(_item isEqualTo ""); private _marker = _vehicleClass createVehicle [0, 0, 0]; -TRACE_1("Created marker", _marker); +TRACE_1("Created marker",_marker); // Set marker start height GVAR(objectHeight) = MAX_HEIGHT; diff --git a/addons/main/XEH_preInit.sqf b/addons/main/XEH_preInit.sqf index 8fde31b..1dadece 100644 --- a/addons/main/XEH_preInit.sqf +++ b/addons/main/XEH_preInit.sqf @@ -2,4 +2,4 @@ // Print version to rpt log private _version = getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "versionStr"); -INFO_1("Metis Enhanced version: %1.", _version); +INFO_1("Metis Enhanced version: %1.",_version); diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 1911232..4d8bdcb 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 6 -#define PATCHLVL 3 -#define BUILD 240113 +#define PATCHLVL 4 +#define BUILD 241020 diff --git a/addons/map/XEH_postInit.sqf b/addons/map/XEH_postInit.sqf index 4748d53..43aa7f0 100644 --- a/addons/map/XEH_postInit.sqf +++ b/addons/map/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -CHECK(!hasinterface); +CHECK(!hasInterface); private _worldMap = format ["Land_Map_%1_F", worldName]; if (!isNull (configFile >> "CfgVehicles" >> _worldMap)) then { diff --git a/addons/map/functions/fnc_addOpenMapAction.sqf b/addons/map/functions/fnc_addOpenMapAction.sqf index a3db6f7..8568d64 100644 --- a/addons/map/functions/fnc_addOpenMapAction.sqf +++ b/addons/map/functions/fnc_addOpenMapAction.sqf @@ -19,7 +19,7 @@ params [["_map", objNull, [objNull]]]; -CHECK(!hasinterface || isNull _map); +CHECK(!hasInterface || isNull _map); private _openMap = [ QGVAR(openMap), diff --git a/addons/map/functions/fnc_addPickupMapAction.sqf b/addons/map/functions/fnc_addPickupMapAction.sqf index 054a1e8..d73cb66 100644 --- a/addons/map/functions/fnc_addPickupMapAction.sqf +++ b/addons/map/functions/fnc_addPickupMapAction.sqf @@ -19,7 +19,7 @@ params [["_map", objNull, [objNull]]]; -CHECK(!hasinterface || isNull _map); +CHECK(!hasInterface || isNull _map); private _pickupMap = [ QGVAR(pickupMap), diff --git a/addons/map/functions/fnc_addPlaceMapAction.sqf b/addons/map/functions/fnc_addPlaceMapAction.sqf index d28172c..59f6693 100644 --- a/addons/map/functions/fnc_addPlaceMapAction.sqf +++ b/addons/map/functions/fnc_addPlaceMapAction.sqf @@ -16,7 +16,7 @@ * */ -CHECK(!hasinterface); +CHECK(!hasInterface); private _placeMapAction = [ QGVAR(placeMapAction), @@ -40,7 +40,7 @@ private _placeMapAction = [ params ["_player"]; private _pos = _player getRelPos [1, 0]; - _pos set [2, (getposATL _player) select 2]; + _pos set [2, (getPosATL _player) select 2]; private _map = GVAR(itemMapClassname) createVehicle [0, 0, 0]; _map setDir ((getDir _player) + 90); diff --git a/addons/map/functions/fnc_getPlaceMapOnVehicleParams.sqf b/addons/map/functions/fnc_getPlaceMapOnVehicleParams.sqf index aa46298..92ee2ba 100644 --- a/addons/map/functions/fnc_getPlaceMapOnVehicleParams.sqf +++ b/addons/map/functions/fnc_getPlaceMapOnVehicleParams.sqf @@ -19,12 +19,12 @@ * */ -params [["_vehicle", objnull, [objNull]], ["_mapObj", objnull, [objNull]]]; +params [["_vehicle", objNull, [objNull]], ["_mapObj", objNull, [objNull]]]; CHECK(isNull _vehicle || isNull _mapObj); private _class = typeOf _vehicle; -private _offset = _vehicle worldToModelVisual (ASLtoAGL (getPosASLVisual _mapObj)); +private _offset = _vehicle worldToModelVisual (ASLToAGL (getPosASLVisual _mapObj)); private _vectorDir = vectorDir _mapObj; private _vectorUp = vectorUp _mapObj; diff --git a/addons/map/functions/fnc_placeMapOnVehicle.sqf b/addons/map/functions/fnc_placeMapOnVehicle.sqf index d39cb1e..bd1aad3 100644 --- a/addons/map/functions/fnc_placeMapOnVehicle.sqf +++ b/addons/map/functions/fnc_placeMapOnVehicle.sqf @@ -34,7 +34,7 @@ params [ ["_conditionArgs", [], [[]]] ]; -CHECK(!hasinterface || _vehClass isEqualTo ""); +CHECK(!hasInterface || _vehClass isEqualTo ""); private _placeMapOnVehAction = [ QGVAR(placeMapOnVehAction), diff --git a/addons/map/functions/fnc_playMapSound.sqf b/addons/map/functions/fnc_playMapSound.sqf index 03b7090..7409ae6 100644 --- a/addons/map/functions/fnc_playMapSound.sqf +++ b/addons/map/functions/fnc_playMapSound.sqf @@ -38,7 +38,7 @@ lineIntersectsSurfaces [ ] select 0 params ["", "", "", "_house"]; private _isInside = _house isKindOf "House"; -TRACE_3("play sound", _soundFile, _soundSource, _isInside); +TRACE_3("play sound",_soundFile,_soundSource,_isInside); playSound3D [_soundFile, _soundSource, _isInside, getPosASL _soundSource, 5, 1, 30]; _soundFile diff --git a/addons/map/functions/fnc_removeMap.sqf b/addons/map/functions/fnc_removeMap.sqf index 9fad82e..5db7ea2 100644 --- a/addons/map/functions/fnc_removeMap.sqf +++ b/addons/map/functions/fnc_removeMap.sqf @@ -21,7 +21,7 @@ params ["_player"]; private _map = (assignedItems _player) param [0, ""]; private _isMap = getText (configFile >> "CfgWeapons" >> _map >> "simulation") == "ItemMap"; -CHECKRET(!_isMap, ""); +CHECKRET(!_isMap,""); _player unlinkItem _map; diff --git a/addons/whistle/XEH_postInit.sqf b/addons/whistle/XEH_postInit.sqf index 535ae6a..4e71a59 100644 --- a/addons/whistle/XEH_postInit.sqf +++ b/addons/whistle/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -CHECK(!hasinterface); +CHECK(!hasInterface); #include "initKeybinds.hpp" diff --git a/addons/zeus/XEH_postInit.sqf b/addons/zeus/XEH_postInit.sqf index 7350d5d..5f5646c 100644 --- a/addons/zeus/XEH_postInit.sqf +++ b/addons/zeus/XEH_postInit.sqf @@ -17,17 +17,17 @@ } forEach _toUnits; }] call CBA_fnc_addEventHandler; -CHECK(!hasinterface); +CHECK(!hasInterface); GVAR(moduleDestination_running) = false; GVAR(3DENComments_drawEHAdded) = false; GVAR(3DENComments_data) = getMissionConfigValue [QGVAR(3denComments), []]; -TRACE_1("3DEN Comments", GVAR(3DENComments_data)); +TRACE_1("3DEN Comments",GVAR(3DENComments_data)); GVAR(ACEIcon_drawEHAdded) = false; -player addEventHandler ["killed", { +player addEventHandler ["Killed", { params ["_unit"]; [QGVAR(killed), [_unit, false]] call CBA_fnc_globalEvent; }]; diff --git a/addons/zeus/functions/fnc_add3DENCommentsDrawEH.sqf b/addons/zeus/functions/fnc_add3DENCommentsDrawEH.sqf index 395dc33..c7723d9 100644 --- a/addons/zeus/functions/fnc_add3DENCommentsDrawEH.sqf +++ b/addons/zeus/functions/fnc_add3DENCommentsDrawEH.sqf @@ -71,7 +71,7 @@ if (!GVAR(3DENComments_drawEHAdded)) then { // MapDraw EH needs to be readded every time the zeus display is opened. LOG("Adding 3DENComments map draw"); -[_display displayCtrl ZEUS_MAP_CTRL, "draw", { +[_display displayCtrl ZEUS_MAP_CTRL, "Draw", { params ["_mapCtrl"]; _thisArgs params ["_3denComments"]; diff --git a/addons/zeus/functions/fnc_addACEUnconsciousIconDrawEH.sqf b/addons/zeus/functions/fnc_addACEUnconsciousIconDrawEH.sqf index cd6c092..c855e81 100644 --- a/addons/zeus/functions/fnc_addACEUnconsciousIconDrawEH.sqf +++ b/addons/zeus/functions/fnc_addACEUnconsciousIconDrawEH.sqf @@ -89,7 +89,7 @@ if (!GVAR(ACEIcon_drawEHAdded)) then { // MapDraw EH needs to be readded every time the zeus display is opened. LOG("Adding ACEUnconsciousIcon map draw"); -[_display displayCtrl ZEUS_MAP_CTRL, "draw", { +[_display displayCtrl ZEUS_MAP_CTRL, "Draw", { params ["_mapCtrl"]; _thisArgs params ["_curatorModule"]; diff --git a/addons/zeus/functions/fnc_drawACEUnconsciousIcon.sqf b/addons/zeus/functions/fnc_drawACEUnconsciousIcon.sqf index 3c4f9cd..b0eba99 100644 --- a/addons/zeus/functions/fnc_drawACEUnconsciousIcon.sqf +++ b/addons/zeus/functions/fnc_drawACEUnconsciousIcon.sqf @@ -17,7 +17,7 @@ * */ -params [["_unit", objnull, [objnull]], ["_isUnconscious", false, [false]]]; +params [["_unit", objNull, [objNull]], ["_isUnconscious", false, [false]]]; TRACE_1("params",_this); CHECK(isNull _unit || !isPlayer _unit); @@ -28,7 +28,7 @@ private _unconsciousPlayers = _curatorModule getVariable [QGVAR(unconsciousPlaye TRACE_3("Unconscious players",player,_curatorModule,_unconsciousPlayers); if (_isUnconscious) then { - _unconsciousPlayers pushbackUnique _unit; + _unconsciousPlayers pushBackUnique _unit; } else { private _unitIndex = _unconsciousPlayers findIf {_x isEqualTo _unit}; // Unit wasn't unconscious before. Unit respawned manually -> do nothing diff --git a/addons/zeus/functions/fnc_getModuleDestination.sqf b/addons/zeus/functions/fnc_getModuleDestination.sqf index 2f41b7a..e7a61ff 100644 --- a/addons/zeus/functions/fnc_getModuleDestination.sqf +++ b/addons/zeus/functions/fnc_getModuleDestination.sqf @@ -53,7 +53,7 @@ params [ ["_beforeDrawingCode", {}, [{}]] ]; -TRACE_1("called", GVAR(moduleDestination_running)); +TRACE_1("called",GVAR(moduleDestination_running)); if (GVAR(moduleDestination_running)) exitWith { [false, _startPosASL, [0,0,0], false, false, false, _args] call _code; @@ -63,7 +63,7 @@ if (GVAR(moduleDestination_running)) exitWith { GVAR(moduleDestination_running) = true; // Add mouse button eh for the zeus display (triggered from 2d or 3d) -GVAR(moduleDestination_displayEHMouse) = [findDisplay ZEUS_DISPLAY, "mouseButtonDown", { +GVAR(moduleDestination_displayEHMouse) = [findDisplay ZEUS_DISPLAY, "MouseButtonDown", { params ["", "_mouseButton", "", "", "_shift", "_ctrl", "_alt"]; if (_mouseButton != 0) exitWith {}; // Only watch for LMB @@ -110,14 +110,14 @@ GVAR(moduleDestination_displayEHKeyboard) = [findDisplay ZEUS_DISPLAY, "KeyDown" }, [_startPosASL, _code, _args]] call CBA_fnc_addBISEventHandler; // Add draw EH for the zeus map - draws the 2D icon and line -GVAR(moduleDestination_mapDrawEH) = [((findDisplay ZEUS_DISPLAY) displayCtrl ZEUS_MAP_CTRL), "draw", { +GVAR(moduleDestination_mapDrawEH) = [((findDisplay ZEUS_DISPLAY) displayCtrl ZEUS_MAP_CTRL), "Draw", { params ["_mapCtrl"]; _thisArgs params ["_startPosASL", "_text", "_icon", "_color", "_angle", "_drawLine", "_drawIconAtStart", "_beforeDrawingCode"]; private _pos2d = (((findDisplay ZEUS_DISPLAY) displayCtrl ZEUS_MAP_CTRL) ctrlMapScreenToWorld getMousePosition); - private _drawingInfo = [ASLtoAGL _startPosASL, _pos2d, _text, _icon, _color, _angle, false] call _beforeDrawingCode; + private _drawingInfo = [ASLToAGL _startPosASL, _pos2d, _text, _icon, _color, _angle, false] call _beforeDrawingCode; if (isNil "_drawingInfo") then { _drawingInfo = []; @@ -125,7 +125,7 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay ZEUS_DISPLAY) displayCtrl ZEU _drawingInfo params [["_iconInfo", [], [[]]], ["_lineInfo", [], [[]]]]; _iconInfo params [["_newPos", _pos2d, [[], objNull]], ["_newText", _text, [""]], ["_newIcon", _icon, [""]], ["_newIconColor", _color, [[]]], ["_newAngle", _angle, [0]]]; - _lineInfo params [["_startLinePos", ASLtoAGL _startPosASL, [[], objNull]], ["_endLinePos", _pos2d, [[], objNull]], ["_newLineColor", _color, [[]]]]; + _lineInfo params [["_startLinePos", ASLToAGL _startPosASL, [[], objNull]], ["_endLinePos", _pos2d, [[], objNull]], ["_newLineColor", _color, [[]]]]; _mapCtrl drawIcon [_newIcon, _newIconColor, _newPos, 24, 24, _newAngle, _newText, 1, 0.03, "TahomaB", "right"]; if (_drawIconAtStart) then { @@ -150,7 +150,7 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay ZEUS_DISPLAY) displayCtrl ZEU // Draw the 3d icon and line private _mousePosAGL = screenToWorld getMousePosition; - private _drawingInfo = [ASLtoAGL _startPosASL, _mousePosAGL, _text, _icon, _color, _angle, true] call _beforeDrawingCode; + private _drawingInfo = [ASLToAGL _startPosASL, _mousePosAGL, _text, _icon, _color, _angle, true] call _beforeDrawingCode; if (isNil "_drawingInfo") then { _drawingInfo = []; @@ -158,7 +158,7 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay ZEUS_DISPLAY) displayCtrl ZEU _drawingInfo params [["_iconInfo", [], [[]]], ["_lineInfo", [], [[]]]]; _iconInfo params [["_newPos", _mousePosAGL, [[], objNull]], ["_newText", _text, [""]], ["_newIcon", _icon, [""]], ["_newIconColor", _color, [[]]], ["_newAngle", _angle, [0]]]; - _lineInfo params [["_startLinePos", ASLtoAGL _startPosASL, [[], objNull]], ["_endLinePos", _mousePosAGL, [[], objNull]], ["_newLineColor", _color, [[]]]]; + _lineInfo params [["_startLinePos", ASLToAGL _startPosASL, [[], objNull]], ["_endLinePos", _mousePosAGL, [[], objNull]], ["_newLineColor", _color, [[]]]]; drawIcon3D [_newIcon, _newIconColor, _newPos, 1.5, 1.5, _newAngle, _newText]; if (_drawIconAtStart) then { @@ -172,9 +172,9 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay ZEUS_DISPLAY) displayCtrl ZEU TRACE_4("cleaning up",_this select 1,GVAR(moduleDestination_displayEHMouse),GVAR(moduleDestination_displayEHKeyboard),GVAR(moduleDestination_mapDrawEH)); (_this select 1) call CBA_fnc_removePerFrameHandler; - (findDisplay ZEUS_DISPLAY) displayRemoveEventHandler ["mouseButtonDown", GVAR(moduleDestination_displayEHMouse)]; + (findDisplay ZEUS_DISPLAY) displayRemoveEventHandler ["MouseButtonDown", GVAR(moduleDestination_displayEHMouse)]; (findDisplay ZEUS_DISPLAY) displayRemoveEventHandler ["KeyDown", GVAR(moduleDestination_displayEHKeyboard)]; - ((findDisplay ZEUS_DISPLAY) displayCtrl ZEUS_MAP_CTRL) ctrlRemoveEventHandler ["draw", GVAR(moduleDestination_mapDrawEH)]; + ((findDisplay ZEUS_DISPLAY) displayCtrl ZEUS_MAP_CTRL) ctrlRemoveEventHandler ["Draw", GVAR(moduleDestination_mapDrawEH)]; GVAR(moduleDestination_displayEHMouse) = nil; GVAR(moduleDestination_displayEHKeyboard) = nil; GVAR(moduleDestination_mapDrawEH) = nil; diff --git a/addons/zeus/functions/fnc_getTargetKnowledge.sqf b/addons/zeus/functions/fnc_getTargetKnowledge.sqf index 5af9d1c..20dd162 100644 --- a/addons/zeus/functions/fnc_getTargetKnowledge.sqf +++ b/addons/zeus/functions/fnc_getTargetKnowledge.sqf @@ -18,10 +18,10 @@ params ["_unit"]; -TRACE_1("getTargetKnowledge called", _this); +TRACE_1("getTargetKnowledge called",_this); //Check if selected unit is an AI -if ((isPlayer _unit) || {isnull _unit}) exitWith { +if ((isPlayer _unit) || {isNull _unit}) exitWith { [LLSTRING(AI_noAI)] call zen_common_fnc_showMessage; }; @@ -36,7 +36,7 @@ if ((isPlayer _unit) || {isnull _unit}) exitWith { curatorMouseOver params ["_typeName", "_target"]; //make sure cursor object is an AI or a player - if (!(_typeName isEqualTo "OBJECT") || {(count (crew _target)) isEqualTo 0} || {isnull _target}) exitWith { + if (!(_typeName isEqualTo "OBJECT") || {(count (crew _target)) isEqualTo 0} || {isNull _target}) exitWith { [LLSTRING(AI_noTarget)] call zen_common_fnc_showMessage; }; diff --git a/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf b/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf index 7fc3550..70352b6 100644 --- a/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf +++ b/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf @@ -20,7 +20,7 @@ { params["", ["_vehicle", objNull, [objNull]]]; - if (!(_vehicle isKindOf "LandVehicle") || {isnull _vehicle}) exitWith { + if (!(_vehicle isKindOf "LandVehicle") || {isNull _vehicle}) exitWith { [LLSTRING(unflipVehicle_noVeh)] call zen_common_fnc_showMessage; }; diff --git a/addons/zeus/functions/fnc_on3DENMissionSave.sqf b/addons/zeus/functions/fnc_on3DENMissionSave.sqf index e524488..3bfb9c4 100644 --- a/addons/zeus/functions/fnc_on3DENMissionSave.sqf +++ b/addons/zeus/functions/fnc_on3DENMissionSave.sqf @@ -21,7 +21,7 @@ params ["_isAutosave"]; CHECK(!is3DEN); -TRACE_1("3DEN Mission saved", _isAutosave); +TRACE_1("3DEN Mission saved",_isAutosave); private _3denComments = []; { @@ -36,6 +36,6 @@ private _3denComments = []; _3denComments pushBack [_x, _name, _description, _positionASL]; } forEach (all3DENEntities param [7, []]); -TRACE_1("Saving comments", _3denComments); +TRACE_1("Saving comments",_3denComments); set3DENMissionAttributes [["Scenario", QGVAR(3denComments), _3denComments]]; diff --git a/addons/zeus/functions/fnc_onZeusDisplayOpen.sqf b/addons/zeus/functions/fnc_onZeusDisplayOpen.sqf index 61f2339..2b4b13f 100644 --- a/addons/zeus/functions/fnc_onZeusDisplayOpen.sqf +++ b/addons/zeus/functions/fnc_onZeusDisplayOpen.sqf @@ -18,7 +18,7 @@ params ["_display"]; -TRACE_1("Zeus display opened", _display); +TRACE_1("Zeus display opened",_display); if (GVAR(enableACEUnconsciousIcon)) then { [_display] call FUNC(addACEUnconsciousIconDrawEH); diff --git a/addons/zeus/functions/fnc_setAIStance.sqf b/addons/zeus/functions/fnc_setAIStance.sqf index dcd51c0..5f36f0a 100644 --- a/addons/zeus/functions/fnc_setAIStance.sqf +++ b/addons/zeus/functions/fnc_setAIStance.sqf @@ -24,6 +24,6 @@ curatorSelected params ["_objects"]; //set stance for each selected unit { - CHECK((isPlayer _x) || {(count (crew _x)) isEqualTo 0} || {isnull _x}); + CHECK((isPlayer _x) || {(count (crew _x)) isEqualTo 0} || {isNull _x}); [_x, _stance] remoteExecCall ["setUnitPos", _x]; } forEach _objects; diff --git a/addons/zeus/functions/fnc_setTargetKnowledge.sqf b/addons/zeus/functions/fnc_setTargetKnowledge.sqf index 816d4b5..93131da 100644 --- a/addons/zeus/functions/fnc_setTargetKnowledge.sqf +++ b/addons/zeus/functions/fnc_setTargetKnowledge.sqf @@ -21,12 +21,12 @@ params [["_type", "REVEAL", [""]], ["_selectedUnits", [], [[]]]]; -TRACE_1("setTargetKnowledge called", _this); +TRACE_1("setTargetKnowledge called",_this); private _allUnits = flatten (_selectedUnits apply {crew _x}); private _units = _allUnits arrayIntersect _allUnits; // Remove duplicate units -TRACE_1("", _units); +TRACE_1("",_units); if (_units isEqualTo []) exitWith { [LLSTRING(AI_noAI)] call zen_common_fnc_showMessage; @@ -54,7 +54,7 @@ private _drawLine = (count _units) isEqualTo 1; curatorMouseOver params ["_typeName", "_target"]; // Make sure target is an AI or a player - if (!(_typeName isEqualTo "OBJECT") || {(count (crew _target)) isEqualTo 0} || {isnull _target}) exitWith { + if (!(_typeName isEqualTo "OBJECT") || {(count (crew _target)) isEqualTo 0} || {isNull _target}) exitWith { [LLSTRING(AI_noTarget)] call zen_common_fnc_showMessage; }; diff --git a/addons/zeus/functions/fnc_switchAIPathBehaviour.sqf b/addons/zeus/functions/fnc_switchAIPathBehaviour.sqf index 06ce5df..95f1fe0 100644 --- a/addons/zeus/functions/fnc_switchAIPathBehaviour.sqf +++ b/addons/zeus/functions/fnc_switchAIPathBehaviour.sqf @@ -26,7 +26,7 @@ curatorSelected params ["_objects"]; //enable/disable movement for each selected unit { - CHECK((isPlayer _x) || {(count (crew _x)) isEqualTo 0} || {isnull _x}); + CHECK((isPlayer _x) || {(count (crew _x)) isEqualTo 0} || {isNull _x}); if (_enableAI) then { [_x, _section] remoteExecCall ["enableAI", _x]; } else {