From 6323d01ca66ccea3f95601365e9f7c2bcc6135f6 Mon Sep 17 00:00:00 2001 From: Grim <69561145+LinkIsGrim@users.noreply.github.com> Date: Sun, 24 Mar 2024 00:41:06 -0300 Subject: [PATCH] General - Move to HEMTT v1.0 (#758) --- .github/workflows/arma.yml | 52 + .github/workflows/build.yml | 40 - .github/workflows/notify.yml | 2 +- .github/workflows/translations.yml | 2 +- .gitignore | 1 + .hemtt/hooks/post_release/01_rename_zip.rhai | 9 + .hemtt/hooks/pre_build/01_set_version.rhai | 4 + .hemtt/missions/test.VR/mission.sqm | 199 +++ .hemtt/project.toml | 31 + VERSION | 1 - addons/area_markers/XEH_preInit.sqf | 2 +- addons/area_markers/gui.hpp | 172 +-- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/attached_objects/XEH_preInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/attributes/XEH_preInit.sqf | 6 +- addons/attributes/gui.hpp | 60 +- ...tAttributes.sqf => initAttributes.inc.sqf} | 0 ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/building_markers/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/camera/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/common/XEH_preInit.sqf | 2 +- addons/common/gui.hpp | 287 ++--- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/compat_ace/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/compositions/RscDisplayCurator.hpp | 22 +- addons/compositions/gui.hpp | 58 +- addons/context_menu/XEH_preInit.sqf | 4 +- addons/context_menu/gui.hpp | 42 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/cover_map/gui.hpp | 12 +- addons/damage/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/dialog/gui.hpp | 100 +- addons/editor/RscDisplayCurator.hpp | 90 +- addons/editor/XEH_preInit.sqf | 4 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/editor_previews/XEH_preInit.sqf | 2 +- .../functions/fnc_handleMouseUpdate.sqf | 2 +- addons/editor_previews/gui.hpp | 8 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/flashlight/XEH_preInit.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 addons/garage/XEH_preInit.sqf | 2 +- addons/garage/functions/fnc_onTabSelect.sqf | 2 +- addons/garage/gui.hpp | 134 +-- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/inventory/XEH_preInit.sqf | 2 +- addons/inventory/gui.hpp | 94 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/loadout/gui.hpp | 42 +- addons/main/script_macros.hpp | 3 +- addons/markers_tree/RscDisplayCurator.hpp | 10 +- addons/modules/CfgVehicles.hpp | 6 +- addons/modules/gui.hpp | 658 +++++----- addons/placement/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/pylons/gui.hpp | 72 +- addons/remote_control/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/tasks/gui.hpp | 58 +- addons/visibility/XEH_preInit.sqf | 2 +- ...{initSettings.sqf => initSettings.inc.sqf} | 0 addons/vision/RscTitles.hpp | 8 +- addons/vision/XEH_preInit.sqf | 4 +- addons/vision/functions/fnc_showHint.sqf | 2 +- ...{initKeybinds.sqf => initKeybinds.inc.sqf} | 0 ...{initSettings.sqf => initSettings.inc.sqf} | 0 hemtt.toml | 26 - include/a3/3den/ui/resincl.inc | 525 ++++++++ include/a3/ui_f/hpp/defineResinclDesign.inc | 1063 +++++++++++++++++ mod.cpp | 4 +- sqfc.json | 6 +- 79 files changed, 2886 insertions(+), 1067 deletions(-) create mode 100644 .github/workflows/arma.yml delete mode 100644 .github/workflows/build.yml create mode 100644 .hemtt/hooks/post_release/01_rename_zip.rhai create mode 100644 .hemtt/hooks/pre_build/01_set_version.rhai create mode 100644 .hemtt/missions/test.VR/mission.sqm create mode 100644 .hemtt/project.toml delete mode 100644 VERSION rename addons/area_markers/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/attached_objects/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/attributes/{initAttributes.sqf => initAttributes.inc.sqf} (100%) rename addons/attributes/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/attributes/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/building_markers/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/camera/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/common/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/compat_ace/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/context_menu/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/context_menu/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/damage/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/editor/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/editor/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/editor_previews/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/flashlight/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/garage/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/inventory/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/placement/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/remote_control/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/visibility/{initSettings.sqf => initSettings.inc.sqf} (100%) rename addons/vision/{initKeybinds.sqf => initKeybinds.inc.sqf} (100%) rename addons/vision/{initSettings.sqf => initSettings.inc.sqf} (100%) delete mode 100644 hemtt.toml create mode 100644 include/a3/3den/ui/resincl.inc create mode 100644 include/a3/ui_f/hpp/defineResinclDesign.inc diff --git a/.github/workflows/arma.yml b/.github/workflows/arma.yml new file mode 100644 index 000000000..c1c9e1fa8 --- /dev/null +++ b/.github/workflows/arma.yml @@ -0,0 +1,52 @@ +name: Arma + +on: + push: + branches: + - master + pull_request: + +jobs: + validate: + runs-on: ubuntu-latest + steps: + - name: Checkout the source code + uses: actions/checkout@v4 + - name: Validate SQF + run: python3 tools/sqf_validator.py + - name: Validate Config + run: python3 tools/config_style_checker.py + - name: Validate Stringtables + run: python3 tools/stringtable_validator.py + - name: Validate Return Types + run: python3 tools/return_checker.py + - name: Check for BOM + uses: arma-actions/bom-check@master + with: + path: 'addons' + + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout the source code + uses: actions/checkout@v4 + - name: Lint (sqflint) + uses: arma-actions/sqflint@master + continue-on-error: true # No failure due to many false-positives + + build: + runs-on: ubuntu-latest + steps: + - name: Checkout the source code + uses: actions/checkout@v4 + - name: Setup HEMTT + uses: arma-actions/hemtt@v1 + - name: Run HEMTT build + run: hemtt build + - name: Rename build folder + run: mv .hemttout/build .hemttout/@zen + - name: Upload Artifact + uses: actions/upload-artifact@v3 + with: + name: zen-${{ github.sha }}-nobin + path: .hemttout/@* diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index ffa81e561..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build - -on: - push: - branches: - - master - pull_request: - -jobs: - validate: - runs-on: ubuntu-latest - steps: - - name: Checkout the source code - uses: actions/checkout@v2 - - name: Validate SQF - run: python3 tools/sqf_validator.py - - name: Validate Config - run: python3 tools/config_style_checker.py - - name: Validate Stringtables - run: python3 tools/stringtable_validator.py - - name: Validate Return Types - run: python3 tools/return_checker.py - - name: Check for BOM - uses: arma-actions/bom-check@master - build: - runs-on: ubuntu-latest - steps: - - name: Checkout the source code - uses: actions/checkout@v2 - - name: Build with HEMTT - uses: arma-actions/hemtt@master - with: - command: build --release --ci - - name: Set short commit hash - run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: zen-${{ env.SHA_SHORT }}-nobin - path: releases/*/* # Upload folder to avoid double-zip artifacts diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml index 4a38d90bd..0b62942e4 100644 --- a/.github/workflows/notify.yml +++ b/.github/workflows/notify.yml @@ -2,7 +2,7 @@ name: Notify on: workflow_run: - workflows: ["Build"] + workflows: ["Arma"] types: - completed diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 0055622a6..1a48a2bea 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -3,7 +3,7 @@ name: Translations on: push: branches: - - master + - master jobs: update: diff --git a/.gitignore b/.gitignore index 2755d4b5c..db73741e8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ CHANGELOG.md *.tar.gz *.zip hemtt* +.hemttout !hemtt.toml @zen tools/armake.exe diff --git a/.hemtt/hooks/post_release/01_rename_zip.rhai b/.hemtt/hooks/post_release/01_rename_zip.rhai new file mode 100644 index 000000000..c8200358f --- /dev/null +++ b/.hemtt/hooks/post_release/01_rename_zip.rhai @@ -0,0 +1,9 @@ +let releases = HEMTT_RFS.join("releases"); + +let src = releases.join(HEMTT.project().prefix() + "-" + HEMTT.project().version().to_string() + ".zip"); +let dst = releases.join(HEMTT.project().name().to_lower() + "_" + HEMTT.project().version().to_string_short() + ".zip"); + +print("Moving zip to " + dst); +if !src.move(dst) { + fatal("Failed to move " + src + " to " + dst); +} diff --git a/.hemtt/hooks/pre_build/01_set_version.rhai b/.hemtt/hooks/pre_build/01_set_version.rhai new file mode 100644 index 000000000..6c653a5bc --- /dev/null +++ b/.hemtt/hooks/pre_build/01_set_version.rhai @@ -0,0 +1,4 @@ +let modcpp = HEMTT_VFS.join("mod.cpp").open_file().read(); +modcpp.replace("0.0.0", HEMTT.project().version().to_string_short()); +HEMTT_VFS.join("mod.cpp").create_file().write(modcpp); +print("mod.cpp version set"); diff --git a/.hemtt/missions/test.VR/mission.sqm b/.hemtt/missions/test.VR/mission.sqm new file mode 100644 index 000000000..27db91572 --- /dev/null +++ b/.hemtt/missions/test.VR/mission.sqm @@ -0,0 +1,199 @@ +version=54; +class EditorData +{ + moveGridStep=1; + angleGridStep=0.2617994; + scaleGridStep=1; + autoGroupingDist=10; + toggles=1; + class ItemIDProvider + { + nextID=3; + }; + class Camera + { + pos[]={0,15,-30}; + }; +}; +binarizationWanted=0; +sourceName="new_test"; +addons[]= +{ + "A3_Characters_F", + "A3_Modules_F_Curator_Curator" +}; +class AddonsMetaData +{ + class List + { + items=2; + class Item0 + { + className="A3_Characters_F"; + name="Arma 3 Alpha - Characters and Clothing"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item1 + { + className="A3_Modules_F_Curator"; + name="Arma 3 Zeus Update - Scripted Modules"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + }; +}; +randomSeed=10288023; +class ScenarioData +{ + author="mharis001"; +}; +class Mission +{ + class Intel + { + timeOfChanges=1800.0002; + startWeather=0; + startWind=0.1; + startWaves=0.1; + forecastWeather=0; + forecastWind=0.1; + forecastWaves=0.1; + forecastLightnings=0.1; + year=2035; + day=28; + hour=13; + minute=37; + startFogDecay=0.014; + forecastFogDecay=0.014; + }; + class Entities + { + items=2; + class Item0 + { + dataType="Group"; + side="West"; + class Entities + { + items=1; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={0,5.0014391,0.050003052}; + }; + side="West"; + flags=7; + class Attributes + { + isPlayer=1; + }; + id=1; + type="B_Soldier_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male09ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + }; + class Attributes + { + }; + id=0; + }; + class Item1 + { + dataType="Logic"; + class PositionInfo + { + position[]={0,5,0}; + }; + id=2; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value="#adminLogged"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + singleType="SCALAR"; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + singleType="SCALAR"; + value=3; + }; + }; + }; + nAttributes=4; + }; + }; + }; +}; diff --git a/.hemtt/project.toml b/.hemtt/project.toml new file mode 100644 index 000000000..1203ec943 --- /dev/null +++ b/.hemtt/project.toml @@ -0,0 +1,31 @@ +name = "Zeus Enhanced" +prefix = "zen" +author = "ZEN Team" +mainprefix = "x" + +[files] +include = [ + "AUTHORS.txt", + "LICENSE", + "logo_zen_ca.paa", + "logo_zen_small_ca.paa", + "meta.cpp", + "mod.cpp", + "README.md", +] + +[version] +git_hash = 0 + +[hemtt.launch] +workshop = [ + "450814997", # CBA_A3 +] +mission = "test.VR" + +[hemtt.launch.ace] +workshop = [ + "450814997", # CBA_A3 + "463939057", # ACE3 +] +mission = "test.VR" diff --git a/VERSION b/VERSION deleted file mode 100644 index 332200146..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.14.0.34 diff --git a/addons/area_markers/XEH_preInit.sqf b/addons/area_markers/XEH_preInit.sqf index c95627a23..ffe0513f1 100644 --- a/addons/area_markers/XEH_preInit.sqf +++ b/addons/area_markers/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (isServer) then { // Unique ID for creating markers diff --git a/addons/area_markers/gui.hpp b/addons/area_markers/gui.hpp index 5e87c99b6..10c35b181 100644 --- a/addons/area_markers/gui.hpp +++ b/addons/area_markers/gui.hpp @@ -15,16 +15,16 @@ class GVAR(icon): RscControlsGroupNoScrollbars { idc = IDC_ICON_GROUP; x = 0; y = 0; - w = ICON_WIDTH; - h = ICON_HEIGHT; + w = QUOTE(ICON_WIDTH); + h = QUOTE(ICON_HEIGHT); class controls { class Icon: RscPicture { idc = IDC_ICON_IMAGE; text = ICON_CENTER; x = 0; y = 0; - w = ICON_WIDTH; - h = ICON_HEIGHT; + w = QUOTE(ICON_WIDTH); + h = QUOTE(ICON_HEIGHT); }; class Mouse: RscText { idc = IDC_ICON_MOUSE; @@ -35,149 +35,149 @@ class GVAR(icon): RscControlsGroupNoScrollbars { onMouseMoving = QUOTE(call FUNC(onMouseMoving)); x = 0; y = 0; - w = ICON_WIDTH; - h = ICON_HEIGHT; + w = QUOTE(ICON_WIDTH); + h = QUOTE(ICON_HEIGHT); }; }; }; class GVAR(configure): RscControlsGroupNoScrollbars { idc = IDC_CONFIGURE_GROUP; - x = safeZoneXAbs; - y = safeZoneY; - w = safeZoneWAbs; - h = safeZoneH; + x = QUOTE(safeZoneXAbs); + y = QUOTE(safeZoneY); + w = QUOTE(safeZoneWAbs); + h = QUOTE(safeZoneH); class controls { class Container: RscControlsGroupNoScrollbars { idc = -1; - x = safeZoneWAbs / 2 - POS_W(13.5); - y = safeZoneH / 2 - POS_H(6.5); - w = POS_W(27); - h = POS_H(13); + x = QUOTE(safeZoneWAbs / 2 - POS_W(13.5)); + y = QUOTE(safeZoneH / 2 - POS_H(6.5)); + w = QUOTE(POS_W(27)); + h = QUOTE(POS_H(13)); class controls { class Title: RscText { text = CSTRING(EditAreaMarker); x = 0; y = 0; - w = POS_W(27); - h = POS_H(1); + w = QUOTE(POS_W(27)); + h = QUOTE(POS_H(1)); colorBackground[] = GUI_THEME_COLOR; }; class Background: RscText { idc = -1; x = 0; - y = POS_H(1.1); - w = POS_W(27); - h = POS_H(10.8); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(27)); + h = QUOTE(POS_H(10.8)); colorBackground[] = {0, 0, 0, 0.7}; }; class Transformation: RscControlsGroupNoScrollbars { idc = -1; - x = POS_W(0.5); - y = POS_H(1.6); - w = POS_W(26); - h = POS_H(3.3); + x = QUOTE(POS_W(0.5)); + y = QUOTE(POS_H(1.6)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(3.3)); class controls { class Title: EGVAR(common,RscLabel) { text = "$STR_3DEN_Object_AttributeCategory_Transformation"; - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(2.3); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(2.3)); }; class SizeLabel: EGVAR(common,RscLabel) { text = "$STR_3DEN_Trigger_Attribute_Size_displayName"; tooltip = "$STR_3DEN_Trigger_Attribute_Size_tooltip"; - x = POS_W(3); - y = POS_H(1.1); - w = POS_W(8.9); + x = QUOTE(POS_W(3)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(8.9)); colorBackground[] = {0, 0, 0, 0.7}; }; class IconA: RscText { idc = -1; style = ST_CENTER; text = "$STR_3DEN_Axis_A"; - x = POS_W(12); - y = POS_H(1.1); - w = POS_W(1); - h = POS_H(1); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); font = "RobotoCondensedLight"; colorBackground[] = {0.77, 0.18, 0.1, 1}; shadow = 0; }; class EditA: EGVAR(common,RscEdit) { idc = IDC_CONFIGURE_SIZE_A; - x = POS_W(13.1); - y = POS_H(1.1) + pixelH; - w = POS_W(4.35); - h = POS_H(1) - pixelH; + x = QUOTE(POS_W(13.1)); + y = QUOTE(POS_H(1.1) + pixelH); + w = QUOTE(POS_W(4.35)); + h = QUOTE(POS_H(1) - pixelH); colorBackground[] = {0, 0, 0, 0.4}; }; class IconB: IconA { text = "$STR_3DEN_Axis_B"; - x = POS_W(17.55); + x = QUOTE(POS_W(17.55)); colorBackground[] = {0.58, 0.82, 0.22, 1}; }; class EditB: EditA { idc = IDC_CONFIGURE_SIZE_B; - x = POS_W(18.65); + x = QUOTE(POS_W(18.65)); }; class RotationLabel: SizeLabel { text = "$STR_3DEN_Object_Attribute_Rotation_displayName"; tooltip = ""; - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); }; class RotationSlider: ctrlXSliderH { idc = IDC_CONFIGURE_ROTATION_SLIDER; - x = POS_W(12); - y = POS_H(2.2); - w = POS_W(8.7); - h = POS_H(1); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(2.2)); + w = QUOTE(POS_W(8.7)); + h = QUOTE(POS_H(1)); }; class RotationEdit: EGVAR(common,RscEdit) { idc = IDC_CONFIGURE_ROTATION_EDIT; - x = POS_W(20.8); - y = POS_H(2.2) + pixelH; - w = POS_W(2.2); + x = QUOTE(POS_W(20.8)); + y = QUOTE(POS_H(2.2) + pixelH); + w = QUOTE(POS_W(2.2)); colorBackground[] = {0, 0, 0, 0.4}; }; }; }; class Style: RscControlsGroupNoScrollbars { idc = -1; - x = POS_W(0.5); - y = POS_H(5); - w = POS_W(26); - h = POS_H(6.5); + x = QUOTE(POS_W(0.5)); + y = QUOTE(POS_H(5)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(6.5)); class controls { class Title: EGVAR(common,RscLabel) { text = "$STR_3DEN_Marker_AttributeCategory_Style"; - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(5.5); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(5.5)); }; class ShapeLabel: EGVAR(common,RscLabel) { text = "$STR_3DEN_Trigger_Attribute_Shape_displayName"; tooltip = "$STR_3DEN_Trigger_Attribute_Shape_tooltip"; - x = POS_W(3); - y = POS_H(1.1); - w = POS_W(8.9); - h = POS_H(2); + x = QUOTE(POS_W(3)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(8.9)); + h = QUOTE(POS_H(2)); colorBackground[] = {0, 0, 0, 0.7}; }; class Shape: ctrlToolboxPictureKeepAspect { idc = IDC_CONFIGURE_SHAPE; - x = POS_W(12); - y = POS_H(1.1); - w = POS_W(11); - h = POS_H(2); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(11)); + h = QUOTE(POS_H(2)); colorBackground[] = {0, 0, 0, 0.7}; rows = 1; columns = 2; @@ -193,58 +193,58 @@ class GVAR(configure): RscControlsGroupNoScrollbars { class BrushLabel: ShapeLabel { text = "$STR_3DEN_Marker_Attribute_Brush_displayName"; tooltip = "$STR_3DEN_Marker_Attribute_Brush_tooltip"; - y = POS_H(3.2); - h = POS_H(1); + y = QUOTE(POS_H(3.2)); + h = QUOTE(POS_H(1)); }; class Brush: EGVAR(common,RscCombo) { idc = IDC_CONFIGURE_BRUSH; - x = POS_W(12); - y = POS_H(3.2); - w = POS_W(11); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(3.2)); + w = QUOTE(POS_W(11)); }; class ColorLabel: BrushLabel { text = "$STR_3DEN_Marker_Attribute_Color_displayName"; tooltip = "$STR_3DEN_Marker_Attribute_Color_tooltip"; - y = POS_H(4.3); + y = QUOTE(POS_H(4.3)); }; class Color: Brush { idc = IDC_CONFIGURE_COLOR; - y = POS_H(4.3); + y = QUOTE(POS_H(4.3)); }; class AlphaLabel: BrushLabel { text = "$STR_3DEN_Marker_Attribute_Alpha_displayName"; tooltip = ""; - y = POS_H(5.4); + y = QUOTE(POS_H(5.4)); }; class AlphaSlider: ctrlXSliderH { idc = IDC_CONFIGURE_ALPHA_SLIDER; - x = POS_W(12); - y = POS_H(5.4); - w = POS_W(8.7); - h = POS_H(1); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(5.4)); + w = QUOTE(POS_W(8.7)); + h = QUOTE(POS_H(1)); }; class AlphaEdit: EGVAR(common,RscEdit) { idc = IDC_CONFIGURE_ALPHA_EDIT; - x = POS_W(20.8); - y = POS_H(5.4) + pixelH; - w = POS_W(2.2); + x = QUOTE(POS_W(20.8)); + y = QUOTE(POS_H(5.4) + pixelH); + w = QUOTE(POS_W(2.2)); colorBackground[] = {0, 0, 0, 0.4}; }; }; }; class ButtonOK: RscButtonMenuOK { idc = IDC_CONFIGURE_OK; - x = POS_W(22); - y = POS_H(12); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_W(22)); + y = QUOTE(POS_H(12)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; class ButtonCancel: RscButtonMenuCancel { idc = IDC_CONFIGURE_CANCEL; x = 0; - y = POS_H(12); - w = POS_W(5); - h = POS_H(1); + y = QUOTE(POS_H(12)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; }; }; diff --git a/addons/area_markers/initSettings.sqf b/addons/area_markers/initSettings.inc.sqf similarity index 100% rename from addons/area_markers/initSettings.sqf rename to addons/area_markers/initSettings.inc.sqf diff --git a/addons/attached_objects/XEH_preInit.sqf b/addons/attached_objects/XEH_preInit.sqf index 92247720c..81efd5cce 100644 --- a/addons/attached_objects/XEH_preInit.sqf +++ b/addons/attached_objects/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" ["ModuleCurator_F", "Init", { params ["_logic"]; diff --git a/addons/attached_objects/initKeybinds.sqf b/addons/attached_objects/initKeybinds.inc.sqf similarity index 100% rename from addons/attached_objects/initKeybinds.sqf rename to addons/attached_objects/initKeybinds.inc.sqf diff --git a/addons/attributes/XEH_preInit.sqf b/addons/attributes/XEH_preInit.sqf index abd6dae3f..22a260e60 100644 --- a/addons/attributes/XEH_preInit.sqf +++ b/addons/attributes/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" // Namespace thats stores data of all attribute displays GVAR(displays) = [] call CBA_fnc_createNamespace; @@ -22,7 +22,7 @@ GVAR(previousMarkerColors) = [] call CBA_fnc_createNamespace; }, true, [], true] call CBA_fnc_addClassEventHandler; // Initialize the core/default attributes -#include "initAttributes.sqf" -#include "initSettings.sqf" +#include "initAttributes.inc.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/attributes/gui.hpp b/addons/attributes/gui.hpp index 602ba23a9..d82638325 100644 --- a/addons/attributes/gui.hpp +++ b/addons/attributes/gui.hpp @@ -14,8 +14,8 @@ class GVAR(base): RscControlsGroupNoScrollbars { function = ""; x = 0; y = 0; - w = POS_W(26); - h = POS_H(1); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); class controls { class Label: EGVAR(common,RscLabel) { idc = IDC_ATTRIBUTE_LABEL; @@ -29,7 +29,7 @@ class GVAR(checkboxes): GVAR(base) { class Label: Label {}; class Background: EGVAR(common,RscBackground) { idc = IDC_ATTRIBUTE_BACKGROUND; - h = POS_H(1); + h = QUOTE(POS_H(1)); }; // Checkboxes created through script based on value info }; @@ -37,22 +37,22 @@ class GVAR(checkboxes): GVAR(base) { class GVAR(code): GVAR(base) { function = QFUNC(gui_code); - h = POS_H(5); + h = QUOTE(POS_H(5)); class controls: controls { class Label: Label {}; class Combo: EGVAR(common,RscCombo) { idc = IDC_ATTRIBUTE_COMBO; font = "EtelkaMonospacePro"; - x = POS_W(10); - w = POS_W(15); - sizeEx = POS_H(0.65); + x = QUOTE(POS_W(10)); + w = QUOTE(POS_W(15)); + sizeEx = QUOTE(POS_H(0.65)); }; class Mode: ctrlButtonPictureKeepAspect { idc = IDC_ATTRIBUTE_MODE; - x = POS_W(25); + x = QUOTE(POS_W(25)); y = 0; - w = POS_W(1); - h = POS_H(1) - pixelH; + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1) - pixelH); offsetPressedX = 0; offsetPressedY = 0; colorBackground[] = {0, 0, 0, 0.5}; @@ -61,11 +61,11 @@ class GVAR(code): GVAR(base) { idc = IDC_ATTRIBUTE_EDIT; style = ST_MULTI; font = "EtelkaMonospacePro"; - x = pixelW; - y = POS_H(1) + pixelH; - w = POS_W(26) - pixelW; - h = POS_H(4) - pixelH; - sizeEx = POS_H(0.7); + x = QUOTE(pixelW); + y = QUOTE(POS_H(1) + pixelH); + w = QUOTE(POS_W(26) - pixelW); + h = QUOTE(POS_H(4) - pixelH); + sizeEx = QUOTE(POS_H(0.7)); autocomplete = "scripting"; }; }; @@ -93,10 +93,10 @@ class GVAR(edit): GVAR(base) { class GVAR(icons): GVAR(base) { function = QFUNC(gui_icons); - h = POS_H(2.5); + h = QUOTE(POS_H(2.5)); class controls: controls { class Label: Label { - h = POS_H(2.5); + h = QUOTE(POS_H(2.5)); }; class Background: EGVAR(common,RscBackground) { idc = IDC_ATTRIBUTE_BACKGROUND; @@ -111,15 +111,15 @@ class GVAR(slider): GVAR(base) { class Label: Label {}; class Slider: ctrlXSliderH { idc = IDC_ATTRIBUTE_SLIDER; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(13.5); - h = POS_H(1); + w = QUOTE(POS_W(13.5)); + h = QUOTE(POS_H(1)); }; class Edit: EGVAR(common,RscEdit) { idc = IDC_ATTRIBUTE_EDIT; - x = POS_W(23.7); - w = POS_W(2.3); + x = QUOTE(POS_W(23.7)); + w = QUOTE(POS_W(2.3)); }; }; }; @@ -136,13 +136,13 @@ class GVAR(waypoint): GVAR(base) { function = QFUNC(gui_waypoint); class controls: controls { class Label: Label { - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { idc = IDC_ATTRIBUTE_BACKGROUND; x = 0; - y = POS_H(1); - w = POS_W(26); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); }; // Toolbox created through script based on available waypoints }; @@ -150,17 +150,17 @@ class GVAR(waypoint): GVAR(base) { class GVAR(loiter): GVAR(base) { function = QFUNC(gui_loiter); - h = POS_H(2); + h = QUOTE(POS_H(2)); class controls: controls { class Label: Label { - h = POS_H(2); + h = QUOTE(POS_H(2)); }; class Toolbox: ctrlToolboxPictureKeepAspect { idc = IDC_ATTRIBUTE_TOOLBOX; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(15.9); - h = POS_H(2); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(2)); rows = 1; columns = 2; strings[] = { diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.inc.sqf similarity index 100% rename from addons/attributes/initAttributes.sqf rename to addons/attributes/initAttributes.inc.sqf diff --git a/addons/attributes/initKeybinds.sqf b/addons/attributes/initKeybinds.inc.sqf similarity index 100% rename from addons/attributes/initKeybinds.sqf rename to addons/attributes/initKeybinds.inc.sqf diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.inc.sqf similarity index 100% rename from addons/attributes/initSettings.sqf rename to addons/attributes/initSettings.inc.sqf diff --git a/addons/building_markers/XEH_preInit.sqf b/addons/building_markers/XEH_preInit.sqf index cfac7f501..23904f8a4 100644 --- a/addons/building_markers/XEH_preInit.sqf +++ b/addons/building_markers/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ["ModuleCurator_F", "Init", { params ["_logic"]; diff --git a/addons/building_markers/initSettings.sqf b/addons/building_markers/initSettings.inc.sqf similarity index 100% rename from addons/building_markers/initSettings.sqf rename to addons/building_markers/initSettings.inc.sqf diff --git a/addons/camera/XEH_preInit.sqf b/addons/camera/XEH_preInit.sqf index 2324a0c91..b8497533f 100644 --- a/addons/camera/XEH_preInit.sqf +++ b/addons/camera/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (isServer) then { ["ModuleCurator_F", "Init", { diff --git a/addons/camera/initSettings.sqf b/addons/camera/initSettings.inc.sqf similarity index 100% rename from addons/camera/initSettings.sqf rename to addons/camera/initSettings.inc.sqf diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index ba495c029..adf0c1bec 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -28,6 +28,6 @@ GVAR(runAfterSettingsInit) = []; GVAR(runAfterSettingsInit) = nil; }] call CBA_fnc_addEventHandler; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/common/gui.hpp b/addons/common/gui.hpp index af3ac4cab..9a0c4493b 100644 --- a/addons/common/gui.hpp +++ b/addons/common/gui.hpp @@ -31,28 +31,28 @@ class GVAR(RscLabel): RscText { idc = -1; x = 0; y = 0; - w = POS_W(10); - h = POS_H(1); + w = QUOTE(POS_W(10)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class GVAR(RscBackground): RscText { idc = -1; style = ST_CENTER; - x = POS_W(10); + x = QUOTE(POS_W(10)); y = 0; - w = POS_W(16); - h = POS_H(2.5); + w = QUOTE(POS_W(16)); + h = QUOTE(POS_H(2.5)); colorText[] = {1, 1, 1, 0.5}; colorBackground[] = COLOR_BACKGROUND_SETTING; }; class GVAR(RscCheckbox): RscCheckBox { idc = -1; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(1); - h = POS_H(1); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); soundClick[] = {"\a3\ui_f\data\sound\rscbutton\soundclick", 0.09, 1}; soundEnter[] = {"\a3\ui_f\data\sound\rscbutton\soundenter", 0.09, 1}; soundEscape[] = {"\a3\ui_f\data\sound\rscbutton\soundescape", 0.09, 1}; @@ -61,10 +61,10 @@ class GVAR(RscCheckbox): RscCheckBox { class GVAR(RscCombo): RscCombo { idc = -1; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(15.9); - h = POS_H(1); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); arrowFull = "\a3\3DEN\Data\Controls\ctrlCombo\arrowFull_ca.paa"; arrowEmpty = "\a3\3DEN\Data\Controls\ctrlCombo\arrowEmpty_ca.paa"; class ComboScrollBar: ComboScrollBar { @@ -77,10 +77,10 @@ class GVAR(RscCombo): RscCombo { class GVAR(RscEdit): RscEdit { idc = -1; - x = POS_W(10.1); - y = pixelH; - w = POS_W(15.9); - h = POS_H(1) - pixelH; + x = QUOTE(POS_W(10.1)); + y = QUOTE(pixelH); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1) - pixelH); colorText[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0.2}; }; @@ -88,9 +88,9 @@ class GVAR(RscEdit): RscEdit { class GVAR(RscListBox): RscListBox { idc = -1; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(6); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(6)); class ListScrollBar: ListScrollBar { arrowEmpty = "\a3\3DEN\Data\Controls\ctrlDefault\arrowEmpty_ca.paa"; arrowFull = "\a3\3DEN\Data\Controls\ctrlDefault\arrowFull_ca.paa"; @@ -101,10 +101,10 @@ class GVAR(RscListBox): RscListBox { class GVAR(RscToolbox): ctrlToolbox { idc = -1; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(15.9); - h = POS_H(1); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); // Allows number of rows and columns to be set dynamically using parsingNamespace rows = QGVAR(rows); columns = QGVAR(columns); @@ -123,43 +123,43 @@ class GVAR(RscControlsGroup): RscControlsGroup { border = "\a3\3DEN\Data\Controls\ctrlDefault\border_ca.paa"; arrowFull = "\a3\3DEN\Data\Controls\ctrlDefault\arrowFull_ca.paa"; arrowEmpty = "\a3\3DEN\Data\Controls\ctrlDefault\arrowEmpty_ca.paa"; - width = POS_W(0.5); + width = QUOTE(POS_W(0.5)); }; }; class GVAR(RscSides): RscControlsGroupNoScrollbars { idc = -1; - x = POS_W(10); + x = QUOTE(POS_W(10)); y = 0; - w = POS_W(16); - h = POS_H(2.5); + w = QUOTE(POS_W(16)); + h = QUOTE(POS_H(2.5)); class controls { class BLUFOR: RscActivePicture { idc = IDC_SIDES_BLUFOR; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_west_ca.paa"; tooltip = "$STR_West"; - x = POS_W(2.5); - y = POS_H(0.25); - w = POS_W(2); - h = POS_H(2); + x = QUOTE(POS_W(2.5)); + y = QUOTE(POS_H(0.25)); + w = QUOTE(POS_W(2)); + h = QUOTE(POS_H(2)); }; class OPFOR: BLUFOR { idc = IDC_SIDES_OPFOR; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_east_ca.paa"; tooltip = "$STR_East"; - x = POS_W(5.5); + x = QUOTE(POS_W(5.5)); }; class Independent: BLUFOR { idc = IDC_SIDES_INDEPENDENT; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_guer_ca.paa"; tooltip = "$STR_Guerrila"; - x = POS_W(8.5); + x = QUOTE(POS_W(8.5)); }; class Civilian: BLUFOR { idc = IDC_SIDES_CIVILIAN; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_civ_ca.paa"; tooltip = "$STR_Civilian"; - x = POS_W(11.5); + x = QUOTE(POS_W(11.5)); }; }; }; @@ -168,14 +168,14 @@ class GVAR(RscOwners): RscControlsGroupNoScrollbars { idc = -1; x = 0; y = 0; - w = POS_W(26); - h = POS_H(10); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(10)); class controls { class Background: GVAR(RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(9); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(9)); }; class ButtonSides: RscButton { idc = IDC_OWNERS_BTN_SIDES; @@ -184,9 +184,9 @@ class GVAR(RscOwners): RscControlsGroupNoScrollbars { font = "RobotoCondensedLight"; x = 0; y = 0; - w = POS_W(26/3); - h = POS_H(1); - sizeEx = 4.32 * (1 / (getResolution select 3)) * pixelGrid * 0.5; + w = QUOTE(POS_W(26/3)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(4.32 * (1 / (getResolution select 3)) * pixelGrid * 0.5); colorBackground[] = {0, 0, 0, 0.5}; colorBackgroundActive[] = COLOR_SETTING(EGVAR(common,darkMode),1,1,1,0.15,0.1,0.1,0.1,0.2); // lighter colorBackgroundDisabled[] = COLOR_BACKGROUND_SETTING; @@ -200,59 +200,59 @@ class GVAR(RscOwners): RscControlsGroupNoScrollbars { class ButtonGroups: ButtonSides { idc = IDC_OWNERS_BTN_GROUPS; text = "$STR_a3_rscdisplaycurator_modegroups_tooltip"; - x = POS_W(26/3); + x = QUOTE(POS_W(26/3)); }; class ButtonPlayers: ButtonSides { idc = IDC_OWNERS_BTN_PLAYERS; text = "$STR_mp_players"; - x = POS_W(52/3); + x = QUOTE(POS_W(52/3)); }; class TabSides: GVAR(RscSides) { idc = IDC_OWNERS_TAB_SIDES; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(9); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(9)); class controls: controls { class BLUFOR: BLUFOR { - x = POS_W(4.25); - y = POS_H(3.25); - w = POS_W(2.5); - h = POS_H(2.5); + x = QUOTE(POS_W(4.25)); + y = QUOTE(POS_H(3.25)); + w = QUOTE(POS_W(2.5)); + h = QUOTE(POS_H(2.5)); }; class OPFOR: OPFOR { - x = POS_W(9.25); - y = POS_H(3.25); - w = POS_W(2.5); - h = POS_H(2.5); + x = QUOTE(POS_W(9.25)); + y = QUOTE(POS_H(3.25)); + w = QUOTE(POS_W(2.5)); + h = QUOTE(POS_H(2.5)); }; class Independent: Independent { - x = POS_W(14.25); - y = POS_H(3.25); - w = POS_W(2.5); - h = POS_H(2.5); + x = QUOTE(POS_W(14.25)); + y = QUOTE(POS_H(3.25)); + w = QUOTE(POS_W(2.5)); + h = QUOTE(POS_H(2.5)); }; class Civilian: Civilian { - x = POS_W(19.25); - y = POS_H(3.25); - w = POS_W(2.5); - h = POS_H(2.5); + x = QUOTE(POS_W(19.25)); + y = QUOTE(POS_H(3.25)); + w = QUOTE(POS_W(2.5)); + h = QUOTE(POS_H(2.5)); }; }; }; class TabGroups: RscControlsGroupNoScrollbars { idc = IDC_OWNERS_TAB_GROUPS; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(9); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(9)); class controls { class List: GVAR(RscListBox) { idc = IDC_OWNERS_GROUPS_LIST; - x = POS_W(0.5); - y = POS_H(0.5); - w = POS_W(25); - h = POS_H(6.8); + x = QUOTE(POS_W(0.5)); + y = QUOTE(POS_H(0.5)); + w = QUOTE(POS_W(25)); + h = QUOTE(POS_H(6.8)); colorSelect[] = {1, 1, 1, 1}; colorSelect2[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0.3}; @@ -262,34 +262,34 @@ class GVAR(RscOwners): RscControlsGroupNoScrollbars { class ButtonSearch: ctrlButtonPicture { idc = IDC_OWNERS_GROUPS_SEARCH_BTN; text = "\a3\Ui_f\data\GUI\RscCommon\RscButtonSearch\search_start_ca.paa"; - x = POS_W(0.5); - y = POS_H(7.5); - w = POS_W(1); - h = POS_H(1); + x = QUOTE(POS_W(0.5)); + y = QUOTE(POS_H(7.5)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; offsetPressedX = 0; offsetPressedY = 0; }; class SearchBar: GVAR(RscEdit) { idc = IDC_OWNERS_GROUPS_SEARCH_BAR; - x = POS_W(1.6); - y = POS_H(7.5); - w = POS_W(10); - h = POS_H(1); - sizeEx = POS_H(0.9); + x = QUOTE(POS_W(1.6)); + y = QUOTE(POS_H(7.5)); + w = QUOTE(POS_W(10)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(0.9)); colorBackground[] = {0, 0, 0, 0.3}; }; class ButtonUncheck: ButtonSearch { idc = IDC_OWNERS_GROUPS_UNCHECK; text = QPATHTOF(ui\uncheck_all_ca.paa); tooltip = CSTRING(UncheckAll); - x = POS_W(23.4); + x = QUOTE(POS_W(23.4)); }; class ButtonCheck: ButtonSearch { idc = IDC_OWNERS_GROUPS_CHECK; text = QPATHTOF(ui\check_all_ca.paa); tooltip = CSTRING(CheckAll); - x = POS_W(24.5); + x = QUOTE(POS_W(24.5)); }; }; }; @@ -324,38 +324,39 @@ class GVAR(RscDisplay) { class Title: RscText { idc = IDC_TITLE; // Store the display's config, onLoad event for displays is not passed the config - onLoad = QUOTE( \ - params [ARR_2('_control','_config')]; \ - private _display = ctrlParent _control; \ - _config = configHierarchy _config select 1; \ - _display setVariable [ARR_2(QQGVAR(config),_config)]; \ + #pragma hemtt suppress pw3_padded_arg + onLoad = QUOTE(\ + params [ARR_2('_control','_config')];\ + private _display = ctrlParent _control;\ + _config = configHierarchy _config select 1;\ + _display setVariable [ARR_2(QQGVAR(config),_config)];\ ); - x = POS_X(6.5); - w = POS_W(27); - h = POS_H(1); + x = QUOTE(POS_X(6.5)); + w = QUOTE(POS_W(27)); + h = QUOTE(POS_H(1)); colorBackground[] = GUI_THEME_COLOR; moving = 1; }; class Background: RscText { idc = IDC_BACKGROUND; - x = POS_X(6.5); - w = POS_W(27); + x = QUOTE(POS_X(6.5)); + w = QUOTE(POS_W(27)); colorBackground[] = {0, 0, 0, 0.7}; }; class Content: RscControlsGroupNoScrollbars { idc = IDC_CONTENT; - x = POS_X(7); - w = POS_W(26); + x = QUOTE(POS_X(7)); + w = QUOTE(POS_W(26)); }; class ButtonOK: RscButtonMenuOK { - x = POS_X(28.5); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_X(28.5)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; class ButtonCancel: RscButtonMenuCancel { - x = POS_X(6.5); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_X(6.5)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; }; }; @@ -366,8 +367,8 @@ class GVAR(RscDisplayScrollbars): GVAR(RscDisplay) { class Background: Background {}; class Content: GVAR(RscControlsGroup) { idc = IDC_CONTENT; - x = POS_X(7); - w = POS_W(26); + x = QUOTE(POS_X(7)); + w = QUOTE(POS_W(26)); }; class ButtonOK: ButtonOK {}; class ButtonCancel: ButtonCancel {}; @@ -381,46 +382,46 @@ class GVAR(messageBox) { class controls { class Title: RscText { idc = IDC_MESSAGE_TITLE; - x = POS_X(12.5); - y = POS_Y(7.5); - w = POS_W(15); - h = POS_H(1); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(7.5)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(1)); colorBackground[] = GUI_THEME_COLOR; moving = 1; }; class Background: RscText { idc = IDC_MESSAGE_BACKGROUND; - x = POS_X(12.5); - y = POS_Y(8.6); - w = POS_W(15); - h = POS_H(3.2); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(8.6)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(3.2)); colorBackground[] = {0, 0, 0, 0.7}; }; class Picture: ctrlStaticPictureKeepAspect { idc = IDC_MESSAGE_PICTURE; - x = POS_X(13); - y = POS_Y(9); - w = POS_W(2); - h = POS_H(2); + x = QUOTE(POS_X(13)); + y = QUOTE(POS_Y(9)); + w = QUOTE(POS_W(2)); + h = QUOTE(POS_H(2)); }; class Text: RscStructuredText { idc = IDC_MESSAGE_TEXT; - x = POS_X(15.5); - y = POS_Y(9); - w = POS_W(11.5); - h = POS_H(5); + x = QUOTE(POS_X(15.5)); + y = QUOTE(POS_Y(9)); + w = QUOTE(POS_W(11.5)); + h = QUOTE(POS_H(5)); }; class ButtonOK: RscButtonMenuOK { - x = POS_X(22.5); - y = POS_Y(10); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_X(22.5)); + y = QUOTE(POS_Y(10)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; class ButtonCancel: RscButtonMenuCancel { - x = POS_X(12.5); - y = POS_Y(10); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(10)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; }; }; @@ -432,36 +433,36 @@ class GVAR(export) { class controls { class Title: RscText { idc = IDC_EXPORT_TITLE; - x = POS_X(5); - y = POS_Y(0); - w = POS_W(30); - h = POS_H(1); + x = QUOTE(POS_X(5)); + y = QUOTE(POS_Y(0)); + w = QUOTE(POS_W(30)); + h = QUOTE(POS_H(1)); colorBackground[] = GUI_THEME_COLOR; moving = 1; }; class Background: RscText { idc = -1; - x = POS_X(5); - y = POS_Y(1.1); - w = POS_W(30); - h = POS_H(22.8); + x = QUOTE(POS_X(5)); + y = QUOTE(POS_Y(1.1)); + w = QUOTE(POS_W(30)); + h = QUOTE(POS_H(22.8)); colorBackground[] = {0, 0, 0, 0.7}; }; class Group: ctrlControlsGroup { idc = IDC_EXPORT_GROUP; - x = POS_X(5.5); - y = POS_Y(1.6); - w = POS_W(29); - h = POS_H(21.8); + x = QUOTE(POS_X(5.5)); + y = QUOTE(POS_Y(1.6)); + w = QUOTE(POS_W(29)); + h = QUOTE(POS_H(21.8)); class controls { class Edit: RscEdit { idc = IDC_EXPORT_EDIT; style = ST_MULTI + ST_NO_RECT; x = 0; y = 0; - w = POS_W(29); - h = POS_H(21.8); - sizeEx = POS_H(0.8); + w = QUOTE(POS_W(29)); + h = QUOTE(POS_H(21.8)); + sizeEx = QUOTE(POS_H(0.8)); colorBackground[] = COLOR_BACKGROUND_SETTING; }; }; @@ -469,15 +470,15 @@ class GVAR(export) { class ButtonClose: RscButtonMenu { idc = IDC_EXPORT_CLOSE; text = "$STR_Disp_Close"; - x = POS_X(5); - y = POS_Y(24); - w = POS_W(10); - h = POS_H(1); + x = QUOTE(POS_X(5)); + y = QUOTE(POS_Y(24)); + w = QUOTE(POS_W(10)); + h = QUOTE(POS_H(1)); }; class ButtonCopy: ButtonClose { idc = IDC_EXPORT_COPY; text = CSTRING(CopyToClipboard); - x = POS_X(15.1); + x = QUOTE(POS_X(15.1)); }; }; }; diff --git a/addons/common/initSettings.sqf b/addons/common/initSettings.inc.sqf similarity index 100% rename from addons/common/initSettings.sqf rename to addons/common/initSettings.inc.sqf diff --git a/addons/compat_ace/XEH_preInit.sqf b/addons/compat_ace/XEH_preInit.sqf index 9361d0501..894773534 100644 --- a/addons/compat_ace/XEH_preInit.sqf +++ b/addons/compat_ace/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/compat_ace/initSettings.sqf b/addons/compat_ace/initSettings.inc.sqf similarity index 100% rename from addons/compat_ace/initSettings.sqf rename to addons/compat_ace/initSettings.inc.sqf diff --git a/addons/compositions/RscDisplayCurator.hpp b/addons/compositions/RscDisplayCurator.hpp index 8d4ccb276..f743a3770 100644 --- a/addons/compositions/RscDisplayCurator.hpp +++ b/addons/compositions/RscDisplayCurator.hpp @@ -4,22 +4,22 @@ class RscDisplayCurator { class controls { class CreateUnitsWest; class CreateGroupsEmpty: CreateUnitsWest { - h = safeZoneH - POS_EDGE(9.3,8.3) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(9.3,8.3) * GUI_GRID_H); }; class GVAR(panel): RscControlsGroupNoScrollbars { idc = IDC_PANEL_GROUP; x = 0; - y = safeZoneH - POS_EDGE(4.2,3.2) * GUI_GRID_H; - w = POS_W(11); - h = POS_H(1.2); + y = QUOTE(safeZoneH - POS_EDGE(4.2,3.2) * GUI_GRID_H); + w = QUOTE(POS_W(11)); + h = QUOTE(POS_H(1.2)); class controls { class Create: ctrlButtonPictureKeepAspect { idc = IDC_PANEL_CREATE; onButtonClick = QUOTE(call FUNC(buttonCreate)); - x = POS_W(0.2); - y = POS_H(0.05); - w = POS_W(1); - h = POS_H(1); + x = QUOTE(POS_W(0.2)); + y = QUOTE(POS_H(0.05)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); text = "\a3\3DEN\Data\Displays\Display3DEN\PanelRight\customcomposition_add_ca.paa"; tooltip = "$STR_3DEN_Display3DEN_CustomCompositionPanel_Add_tooltip"; colorFocused[] = {0, 0, 0, 0}; @@ -31,21 +31,21 @@ class RscDisplayCurator { idc = IDC_PANEL_EDIT; onLoad = QUOTE((_this select 0) ctrlEnable false); onButtonClick = QUOTE(call FUNC(buttonEdit)); - x = POS_W(1.3); + x = QUOTE(POS_W(1.3)); text = "\a3\3DEN\Data\Displays\Display3DEN\PanelRight\customcomposition_edit_ca.paa"; tooltip = "$STR_3DEN_Display3DEN_CustomCompositionPanel_Edit_tooltip"; }; class Randomize: Create { idc = IDC_PANEL_RANDOMIZE; onButtonClick = QUOTE(call FUNC(buttonRandomize)); - x = POS_W(2.4); + x = QUOTE(POS_W(2.4)); text = QPATHTOF(ui\randomize_ca.paa); tooltip = ""; }; class Delete: Edit { idc = IDC_PANEL_DELETE; onButtonClick = QUOTE(call FUNC(buttonDelete)); - x = POS_W(9.8); + x = QUOTE(POS_W(9.8)); text = "\a3\3DEN\Data\Displays\Display3DEN\PanelLeft\entityList_delete_ca.paa"; tooltip = "$STR_3DEN_Display3DEN_CustomCompositionPanel_Delete_tooltip"; }; diff --git a/addons/compositions/gui.hpp b/addons/compositions/gui.hpp index ae07206a7..9fa7b37e1 100644 --- a/addons/compositions/gui.hpp +++ b/addons/compositions/gui.hpp @@ -16,60 +16,60 @@ class GVAR(display) { class controls { class Title: RscText { idc = IDC_DISPLAY_TITLE; - x = POS_X(6.5); - y = POS_Y(9.85); - w = POS_W(27); - h = POS_H(1); + x = QUOTE(POS_X(6.5)); + y = QUOTE(POS_Y(9.85)); + w = QUOTE(POS_W(27)); + h = QUOTE(POS_H(1)); colorBackground[] = GUI_THEME_COLOR; moving = 1; }; class Background: RscText { idc = -1; - x = POS_X(6.5); - y = POS_Y(10.95); - w = POS_W(27); - h = POS_H(3.1); + x = QUOTE(POS_X(6.5)); + y = QUOTE(POS_Y(10.95)); + w = QUOTE(POS_W(27)); + h = QUOTE(POS_H(3.1)); colorBackground[] = {0, 0, 0, 0.7}; }; class CategoryLabel: EGVAR(common,RscLabel) { text = "$STR_3DEN_Display3DENEditComposition_CategoryLabel_text"; - x = POS_X(7); - y = POS_Y(11.45); - w = POS_W(10); + x = QUOTE(POS_X(7)); + y = QUOTE(POS_Y(11.45)); + w = QUOTE(POS_W(10)); }; class CategoryEdit: EGVAR(common,RscEdit) { idc = IDC_DISPLAY_CATEGORY; - x = POS_X(17.1); - y = POS_Y(11.45); - w = POS_W(14.8); + x = QUOTE(POS_X(17.1)); + y = QUOTE(POS_Y(11.45)); + w = QUOTE(POS_W(14.8)); }; class CategoryList: EGVAR(common,RscCombo) { idc = IDC_DISPLAY_LIST; - x = POS_X(31.9); - y = POS_Y(11.45); - w = POS_W(1); - sizeEx = POS_H(0.9); + x = QUOTE(POS_X(31.9)); + y = QUOTE(POS_Y(11.45)); + w = QUOTE(POS_W(1)); + sizeEx = QUOTE(POS_H(0.9)); }; class NameLabel: CategoryLabel { text = "$STR_3DEN_Object_Attribute_UnitName_displayName"; - y = POS_Y(12.55); + y = QUOTE(POS_Y(12.55)); }; class NameEdit: CategoryEdit { idc = IDC_DISPLAY_NAME; - y = POS_Y(12.55); - w = POS_W(15.9); + y = QUOTE(POS_Y(12.55)); + w = QUOTE(POS_W(15.9)); }; class ButtonOK: RscButtonMenuOK { - x = POS_X(28.5); - y = POS_Y(14.15); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_X(28.5)); + y = QUOTE(POS_Y(14.15)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; class ButtonCancel: RscButtonMenuCancel { - x = POS_X(6.5); - y = POS_Y(14.15); - w = POS_W(5); - h = POS_H(1); + x = QUOTE(POS_X(6.5)); + y = QUOTE(POS_Y(14.15)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(1)); }; }; }; diff --git a/addons/context_menu/XEH_preInit.sqf b/addons/context_menu/XEH_preInit.sqf index 26fb2cbde..cfffa0613 100644 --- a/addons/context_menu/XEH_preInit.sqf +++ b/addons/context_menu/XEH_preInit.sqf @@ -6,8 +6,8 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" -#include "initKeybinds.sqf" +#include "initSettings.inc.sqf" +#include "initKeybinds.inc.sqf" call FUNC(compileActions); diff --git a/addons/context_menu/gui.hpp b/addons/context_menu/gui.hpp index 14b79c993..a3e9121b6 100644 --- a/addons/context_menu/gui.hpp +++ b/addons/context_menu/gui.hpp @@ -6,15 +6,15 @@ class GVAR(group): RscControlsGroupNoScrollbars { idc = IDC_CONTEXT_GROUP; x = 0; y = 0; - w = POS_W(8); - h = POS_H(1); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); class controls { class Background: RscText { idc = IDC_CONTEXT_BACKGROUND; x = 0; y = 0; - w = POS_W(8); - h = POS_H(1); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); colorBackground[] = {0.1, 0.1, 0.1, 0.5}; }; }; @@ -24,47 +24,47 @@ class GVAR(row): RscControlsGroupNoScrollbars { idc = IDC_CONTEXT_ROW; x = 0; y = 0; - w = POS_W(8); - h = POS_H(1); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); class controls { class Highlight: RscText { idc = IDC_CONTEXT_HIGHLIGHT; x = 0; y = 0; - w = POS_W(8); - h = POS_H(1); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); }; class Name: RscText { idc = IDC_CONTEXT_NAME; - x = POS_W(1.1); + x = QUOTE(POS_W(1.1)); y = 0; - w = POS_W(5.9); - h = POS_H(1); - sizeEx = POS_H(0.8); + w = QUOTE(POS_W(5.9)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(0.8)); shadow = 0; }; class Icon: RscPicture { idc = IDC_CONTEXT_ICON; - x = POS_W(0.2); - y = POS_H(0.05); - w = POS_W(0.9); - h = POS_H(0.9); + x = QUOTE(POS_W(0.2)); + y = QUOTE(POS_H(0.05)); + w = QUOTE(POS_W(0.9)); + h = QUOTE(POS_H(0.9)); }; class Expandable: RscPicture { idc = IDC_CONTEXT_EXPANDABLE; text = QPATHTOF(ui\arrow_ca.paa); - x = POS_W(7); + x = QUOTE(POS_W(7)); y = 0; - w = POS_W(1); - h = POS_H(1); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); }; class MouseArea: RscText { idc = IDC_CONTEXT_MOUSE; style = ST_MULTI; x = 0; y = 0; - w = POS_W(8); - h = POS_H(1); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); }; }; }; diff --git a/addons/context_menu/initKeybinds.sqf b/addons/context_menu/initKeybinds.inc.sqf similarity index 100% rename from addons/context_menu/initKeybinds.sqf rename to addons/context_menu/initKeybinds.inc.sqf diff --git a/addons/context_menu/initSettings.sqf b/addons/context_menu/initSettings.inc.sqf similarity index 100% rename from addons/context_menu/initSettings.sqf rename to addons/context_menu/initSettings.inc.sqf diff --git a/addons/cover_map/gui.hpp b/addons/cover_map/gui.hpp index 186bc159d..dc4661f04 100644 --- a/addons/cover_map/gui.hpp +++ b/addons/cover_map/gui.hpp @@ -61,22 +61,22 @@ class GVAR(display): EGVAR(modules,RscDisplay) { class Content: Content { // Map is created through script since map controls cannot be inside controls groups // Extra height is used here so other display elements are positioned correctly - h = POS_H(22.1); + h = QUOTE(POS_H(22.1)); class controls { class RotationLabel: EGVAR(common,RscLabel) { text = "$STR_3DEN_Object_Attribute_Rotation_displayName"; }; class RotationSlider: ctrlXSliderH { idc = IDC_CM_ROTATION_SLIDER; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(13.5); - h = POS_H(1); + w = QUOTE(POS_W(13.5)); + h = QUOTE(POS_H(1)); }; class RotationEdit: EGVAR(common,RscEdit) { idc = IDC_CM_ROTATION_EDIT; - x = POS_W(23.7); - w = POS_W(2.3); + x = QUOTE(POS_W(23.7)); + w = QUOTE(POS_W(2.3)); }; }; }; diff --git a/addons/damage/XEH_preInit.sqf b/addons/damage/XEH_preInit.sqf index 7b403d030..9c73a69e3 100644 --- a/addons/damage/XEH_preInit.sqf +++ b/addons/damage/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" [QGVAR(setHitPointsDamage), { params ["_vehicle", "_damageValues"]; diff --git a/addons/damage/initSettings.sqf b/addons/damage/initSettings.inc.sqf similarity index 100% rename from addons/damage/initSettings.sqf rename to addons/damage/initSettings.inc.sqf diff --git a/addons/dialog/gui.hpp b/addons/dialog/gui.hpp index 7294e3727..278e30655 100644 --- a/addons/dialog/gui.hpp +++ b/addons/dialog/gui.hpp @@ -17,8 +17,8 @@ class GVAR(Row_Base): RscControlsGroupNoScrollbars { idc = IDC_ROW_GROUP; x = 0; y = 0; - w = POS_W(26); - h = POS_H(1); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); class controls { class Label: EGVAR(common,RscLabel) { idc = IDC_ROW_LABEL; @@ -38,61 +38,61 @@ class GVAR(Row_Checkbox): GVAR(Row_Base) { class GVAR(Row_ColorRGB): GVAR(Row_Base) { function = QFUNC(gui_color); - h = POS_H(3); + h = QUOTE(POS_H(3)); class controls: controls { class Label: Label {}; class Preview: RscText { idc = IDC_ROW_COLOR_PREVIEW; x = 0; - y = POS_H(1); - w = POS_W(10); - h = POS_H(2); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(10)); + h = QUOTE(POS_H(2)); }; class Red: ctrlXSliderH { idc = IDC_ROW_COLOR_RED; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(13.8); - h = POS_H(1); + w = QUOTE(POS_W(13.8)); + h = QUOTE(POS_H(1)); color[] = {1, 0, 0, 0.6}; colorActive[] = {1, 0, 0, 1}; }; class Red_Edit: EGVAR(common,RscEdit) { idc = IDC_ROW_COLOR_RED_EDIT; - x = POS_W(24); + x = QUOTE(POS_W(24)); y = 0; - w = POS_W(2); - h = POS_H(1); + w = QUOTE(POS_W(2)); + h = QUOTE(POS_H(1)); }; class Green: Red { idc = IDC_ROW_COLOR_GREEN; - y = POS_H(1); + y = QUOTE(POS_H(1)); color[] = {0, 1, 0, 0.6}; colorActive[] = {0, 1, 0, 1}; }; class Green_Edit: Red_Edit { idc = IDC_ROW_COLOR_GREEN_EDIT; - y = POS_H(1); + y = QUOTE(POS_H(1)); }; class Blue: Red { idc = IDC_ROW_COLOR_BLUE; - y = POS_H(2); + y = QUOTE(POS_H(2)); color[] = {0, 0, 1, 0.6}; colorActive[] = {0, 0, 1, 1}; }; class Blue_Edit: Red_Edit { idc = IDC_ROW_COLOR_BLUE_EDIT; - y = POS_H(2); + y = QUOTE(POS_H(2)); }; }; }; class GVAR(Row_ColorRGBA): GVAR(Row_ColorRGB) { - h = POS_H(4); + h = QUOTE(POS_H(4)); class controls: controls { class Label: Label {}; class Preview: Preview { - h = POS_H(3); + h = QUOTE(POS_H(3)); }; class Red: Red {}; class Red_Edit: Red_Edit {}; @@ -102,13 +102,13 @@ class GVAR(Row_ColorRGBA): GVAR(Row_ColorRGB) { class Blue_Edit: Blue_Edit {}; class Alpha: Red { idc = IDC_ROW_COLOR_ALPHA; - y = POS_H(3); + y = QUOTE(POS_H(3)); color[] = {1, 1, 1, 0.6}; colorActive[] = {1, 1, 1, 1}; }; class Alpha_Edit: Red_Edit { idc = IDC_ROW_COLOR_ALPHA_EDIT; - y = POS_H(3); + y = QUOTE(POS_H(3)); }; }; }; @@ -136,13 +136,13 @@ class GVAR(Row_Edit): GVAR(Row_Base) { class GVAR(Row_EditMulti): GVAR(Row_Edit) { class controls: controls { class Label: Label { - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Edit: Edit { style = ST_MULTI; - x = pixelW; - y = POS_H(1); - w = POS_W(26) - pixelW; + x = QUOTE(pixelW); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26) - pixelW); }; }; }; @@ -152,7 +152,7 @@ class GVAR(Row_EditCode): GVAR(Row_EditMulti) { class Label: Label {}; class Edit: Edit { font = "EtelkaMonospacePro"; - sizeEx = POS_H(0.7); + sizeEx = QUOTE(POS_H(0.7)); autocomplete = "scripting"; }; }; @@ -162,7 +162,7 @@ class GVAR(Row_List): GVAR(Row_Base) { function = QFUNC(gui_list); class controls: controls { class Label: Label { - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class List: EGVAR(common,RscListBox) { // Using IDC for combo since handling is identical and the combo initialization function is called to add entries @@ -173,24 +173,24 @@ class GVAR(Row_List): GVAR(Row_Base) { class GVAR(Row_Owners): GVAR(Row_Base) { function = QFUNC(gui_owners); - h = POS_H(11); + h = QUOTE(POS_H(11)); class controls: controls { class Label: Label { - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Owners: EGVAR(common,RscOwners) { idc = IDC_ROW_OWNERS; - y = POS_H(1); + y = QUOTE(POS_H(1)); }; }; }; class GVAR(Row_Sides): GVAR(Row_Base) { function = QFUNC(gui_sides); - h = POS_H(2.5); + h = QUOTE(POS_H(2.5)); class controls: controls { class Label: Label { - h = POS_H(2.5); + h = QUOTE(POS_H(2.5)); }; class Background: EGVAR(common,RscBackground) {}; class Sides: EGVAR(common,RscSides) { @@ -205,15 +205,15 @@ class GVAR(Row_Slider): GVAR(Row_Base) { class Label: Label {}; class Slider: ctrlXSliderH { idc = IDC_ROW_SLIDER; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(13.5); - h = POS_H(1); + w = QUOTE(POS_W(13.5)); + h = QUOTE(POS_H(1)); }; class Edit: EGVAR(common,RscEdit) { idc = IDC_ROW_EDIT; - x = POS_W(23.7); - w = POS_W(2.3); + x = QUOTE(POS_W(23.7)); + w = QUOTE(POS_W(2.3)); }; }; }; @@ -234,27 +234,27 @@ class GVAR(Row_VectorXY): GVAR(Row_Base) { idc = -1; style = ST_CENTER; text = "$STR_3DEN_Axis_X"; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(1); - h = POS_H(1); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); font = "RobotoCondensedLight"; colorBackground[] = {0.77, 0.18, 0.1, 1}; shadow = 0; }; class EditX: EGVAR(common,RscEdit) { idc = IDC_ROW_VECTOR_X; - x = POS_W(11.2); - w = POS_W(6.8); + x = QUOTE(POS_W(11.2)); + w = QUOTE(POS_W(6.8)); }; class IconY: IconX { text = "$STR_3DEN_Axis_Y"; - x = POS_W(18.1); + x = QUOTE(POS_W(18.1)); colorBackground[] = {0.58, 0.82, 0.22, 1}; }; class EditY: EditX { idc = IDC_ROW_VECTOR_Y; - x = POS_W(19.2); + x = QUOTE(POS_W(19.2)); }; }; }; @@ -264,24 +264,24 @@ class GVAR(Row_VectorXYZ): GVAR(Row_VectorXY) { class Label: Label {}; class IconX: IconX {}; class EditX: EditX { - w = POS_W(12.4/3); + w = QUOTE(POS_W(12.4/3)); }; class IconY: IconY { - x = POS_W(11.3 + 12.4/3); + x = QUOTE(POS_W(11.3 + 12.4/3)); }; class EditY: EditY { - x = POS_W(12.4 + 12.4/3); - w = POS_W(12.4/3); + x = QUOTE(POS_W(12.4 + 12.4/3)); + w = QUOTE(POS_W(12.4/3)); }; class IconZ: IconX { text = "$STR_3DEN_Axis_Z"; - x = POS_W(12.5 + 2 * 12.4/3); + x = QUOTE(POS_W(12.5 + 2 * 12.4/3)); colorBackground[] = {0.26, 0.52, 0.92, 1}; }; class EditZ: EditX { idc = IDC_ROW_VECTOR_Z; - x = POS_W(13.6 + 2 * 12.4/3); - w = POS_W(12.4/3); + x = QUOTE(POS_W(13.6 + 2 * 12.4/3)); + w = QUOTE(POS_W(12.4/3)); }; }; }; diff --git a/addons/editor/RscDisplayCurator.hpp b/addons/editor/RscDisplayCurator.hpp index cf1188297..6e7d520b5 100644 --- a/addons/editor/RscDisplayCurator.hpp +++ b/addons/editor/RscDisplayCurator.hpp @@ -15,69 +15,69 @@ class EGVAR(common,RscCheckbox); class RscDisplayCurator { class Controls { class Main: RscControlsGroupNoScrollbars { - x = safeZoneX + POS_EDGE(12.5,11) * GUI_GRID_W; - y = safeZoneY + POS_EDGE(0.5,0) * GUI_GRID_H; - w = safeZoneW - POS_EDGE(25,22) * GUI_GRID_W; + x = QUOTE(safeZoneX + POS_EDGE(12.5,11) * GUI_GRID_W); + y = QUOTE(safeZoneY + POS_EDGE(0.5,0) * GUI_GRID_H); + w = QUOTE(safeZoneW - POS_EDGE(25,22) * GUI_GRID_W); class controls { class PointsBackground: RscText { - w = safeZoneW - POS_EDGE(25,22) * GUI_GRID_W; + w = QUOTE(safeZoneW - POS_EDGE(25,22) * GUI_GRID_W); }; class Points: RscText { - w = safeZoneW - POS_EDGE(25,22) * GUI_GRID_W; + w = QUOTE(safeZoneW - POS_EDGE(25,22) * GUI_GRID_W); }; class PointsPreview: RscText { - x = POS_EDGE(7,8) * GUI_GRID_W; + x = QUOTE(POS_EDGE(7,8) * GUI_GRID_W); }; class PointsFrame: RscFrame { - w = safeZoneW - POS_EDGE(25,22) * GUI_GRID_W; + w = QUOTE(safeZoneW - POS_EDGE(25,22) * GUI_GRID_W); }; class Logo: RscPicture { - x = (safeZoneW - POS_EDGE(25,22) * GUI_GRID_W) / 2 - 0.5 * GUI_GRID_W; + x = QUOTE((safeZoneW - POS_EDGE(25,22) * GUI_GRID_W) / 2 - 0.5 * GUI_GRID_W); }; class FeedbackMessage: RscText { - w = safeZoneW - POS_EDGE(25,22) * GUI_GRID_W; + w = QUOTE(safeZoneW - POS_EDGE(25,22) * GUI_GRID_W); }; }; }; class AddBar: RscControlsGroupNoScrollbars { - x = safeZoneX + safeZoneW - POS_EDGE(12.5,11) * GUI_GRID_W; - y = safeZoneY + POS_EDGE(0.5,0) * GUI_GRID_H; + x = QUOTE(safeZoneX + safeZoneW - POS_EDGE(12.5,11) * GUI_GRID_W); + y = QUOTE(safeZoneY + POS_EDGE(0.5,0) * GUI_GRID_H); }; class Add: RscControlsGroupNoScrollbars { - x = safeZoneX + safeZoneW - POS_EDGE(12.5,11) * GUI_GRID_W; - y = safeZoneY + POS_EDGE(1.5,1) * GUI_GRID_H; - h = safeZoneH - POS_EDGE(2,1) * GUI_GRID_H; + x = QUOTE(safeZoneX + safeZoneW - POS_EDGE(12.5,11) * GUI_GRID_W); + y = QUOTE(safeZoneY + POS_EDGE(1.5,1) * GUI_GRID_H); + h = QUOTE(safeZoneH - POS_EDGE(2,1) * GUI_GRID_H); class controls { class CreateBackground: RscText { - h = safeZoneH - POS_EDGE(2,1) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(2,1) * GUI_GRID_H); }; class CreateClassesBackground: RscText { - h = safeZoneH - POS_EDGE(6,5) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(6,5) * GUI_GRID_H); }; class CreateFrame: RscFrame { - h = safeZoneH - POS_EDGE(6,5) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(6,5) * GUI_GRID_H); }; class CreateSearch: RscEdit { - x = 0.15 * GUI_GRID_W; - w = 7.7 * GUI_GRID_W; + x = QUOTE(0.15 * GUI_GRID_W); + w = QUOTE(7.7 * GUI_GRID_W); }; class CreateSearchButton: RscButtonSearch { - x = 7.9 * GUI_GRID_W; + x = QUOTE(7.9 * GUI_GRID_W); }; class CollapseAll: CreateSearchButton { idc = IDC_COLLAPSE_ALL; text = "\a3\3DEN\Data\Displays\Display3DEN\tree_collapse_ca.paa"; tooltip = "$STR_3DEN_ctrlButtonCollapseAll_text"; - x = 8.9 * GUI_GRID_W; + x = QUOTE(8.9 * GUI_GRID_W); }; class ExpandAll: CollapseAll { idc = IDC_EXPAND_ALL; text = QPATHTOF(ui\tree_expand_ca.paa); tooltip = "$STR_3DEN_ctrlButtonExpandAll_text"; - x = 9.9 * GUI_GRID_W; + x = QUOTE(9.9 * GUI_GRID_W); }; class CreateUnitsWest: RscTree { - h = safeZoneH - POS_EDGE(8.1,7.1) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(8.1,7.1) * GUI_GRID_H); class ScrollBar: ScrollBar { thumb = "\a3\3DEN\Data\Controls\ctrlDefault\thumb_ca.paa"; border = "\a3\3DEN\Data\Controls\ctrlDefault\border_ca.paa"; @@ -87,63 +87,63 @@ class RscDisplayCurator { }; class VehicleCrew: RscControlsGroupNoScrollbars { x = 0; - y = safeZoneH - POS_EDGE(3,2) * GUI_GRID_H; - w = 11 * GUI_GRID_W; - h = GUI_GRID_H; + y = QUOTE(safeZoneH - POS_EDGE(3,2) * GUI_GRID_H); + w = QUOTE(11 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); class controls { class Background: RscText { x = 0; y = 0; - w = 11 * GUI_GRID_W; - h = GUI_GRID_H; + w = QUOTE(11 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); colorBackground[] = {0, 0, 0, 0.2}; }; class Line: RscLine { x = 0; - y = pixelH; - w = 11 * GUI_GRID_W; + y = QUOTE(pixelH); + w = QUOTE(11 * GUI_GRID_W); h = 0; colorText[] = {0, 0, 0, 1}; }; class Label: RscText { text = "$STR_3DEN_Display3DEN_VehiclePanel_TextEmpty_text"; - x = GUI_GRID_W; + x = QUOTE(GUI_GRID_W); y = 0; - w = 10 * GUI_GRID_W; - h = GUI_GRID_H; - sizeEx = 0.9 * GUI_GRID_H; + w = QUOTE(10 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); + sizeEx = QUOTE(0.9 * GUI_GRID_H); shadow = 0; }; class Toggle: EGVAR(common,RscCheckbox) { idc = IDC_INCLUDE_CREW; onLoad = QUOTE((_this select 0) cbSetChecked GVAR(includeCrew)); onCheckedChanged = QUOTE(GVAR(includeCrew) = !GVAR(includeCrew)); - x = 0.1 * GUI_GRID_W; + x = QUOTE(0.1 * GUI_GRID_W); y = 0; - w = GUI_GRID_W; - h = GUI_GRID_H; + w = QUOTE(GUI_GRID_W); + h = QUOTE(GUI_GRID_H); }; }; }; }; }; class MissionBar: RscControlsGroupNoScrollbars { - x = safeZoneX + POS_EDGE(1.5,0) * GUI_GRID_W; - y = safeZoneY + POS_EDGE(0.5,0) * GUI_GRID_H; + x = QUOTE(safeZoneX + POS_EDGE(1.5,0) * GUI_GRID_W); + y = QUOTE(safeZoneY + POS_EDGE(0.5,0) * GUI_GRID_H); }; class Mission: RscControlsGroupNoScrollbars { - x = safeZoneX + POS_EDGE(1.5,0) * GUI_GRID_W; - y = safeZoneY + POS_EDGE(1.5,1) * GUI_GRID_H; - h = safeZoneH - POS_EDGE(2,1) * GUI_GRID_H; + x = QUOTE(safeZoneX + POS_EDGE(1.5,0) * GUI_GRID_W); + y = QUOTE(safeZoneY + POS_EDGE(1.5,1) * GUI_GRID_H); + h = QUOTE(safeZoneH - POS_EDGE(2,1) * GUI_GRID_H); class controls { class EntitiesBackground: RscText { - h = safeZoneH - POS_EDGE(2,1) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(2,1) * GUI_GRID_H); }; class EntitiesFrame: RscFrame { - h = safeZoneH - POS_EDGE(2,1) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(2,1) * GUI_GRID_H); }; class Entities: RscTree { - h = safeZoneH - POS_EDGE(2,1) * GUI_GRID_H; + h = QUOTE(safeZoneH - POS_EDGE(2,1) * GUI_GRID_H); class ScrollBar: ScrollBar { thumb = "\a3\3DEN\Data\Controls\ctrlDefault\thumb_ca.paa"; border = "\a3\3DEN\Data\Controls\ctrlDefault\border_ca.paa"; diff --git a/addons/editor/XEH_preInit.sqf b/addons/editor/XEH_preInit.sqf index c6583464f..6bdbfac2a 100644 --- a/addons/editor/XEH_preInit.sqf +++ b/addons/editor/XEH_preInit.sqf @@ -6,8 +6,8 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" -#include "initKeybinds.sqf" +#include "initSettings.inc.sqf" +#include "initKeybinds.inc.sqf" GVAR(clipboard) = []; GVAR(includeCrew) = true; diff --git a/addons/editor/initKeybinds.sqf b/addons/editor/initKeybinds.inc.sqf similarity index 100% rename from addons/editor/initKeybinds.sqf rename to addons/editor/initKeybinds.inc.sqf diff --git a/addons/editor/initSettings.sqf b/addons/editor/initSettings.inc.sqf similarity index 100% rename from addons/editor/initSettings.sqf rename to addons/editor/initSettings.inc.sqf diff --git a/addons/editor_previews/XEH_preInit.sqf b/addons/editor_previews/XEH_preInit.sqf index 9361d0501..894773534 100644 --- a/addons/editor_previews/XEH_preInit.sqf +++ b/addons/editor_previews/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/editor_previews/functions/fnc_handleMouseUpdate.sqf b/addons/editor_previews/functions/fnc_handleMouseUpdate.sqf index 5de196d06..80ef1242c 100644 --- a/addons/editor_previews/functions/fnc_handleMouseUpdate.sqf +++ b/addons/editor_previews/functions/fnc_handleMouseUpdate.sqf @@ -43,7 +43,7 @@ if (_type isEqualTo "") then { _ctrlImage ctrlCommit 0; _ctrlGroup ctrlShow true; - _ctrlGroup ctrlSetPositionX (safeZoneX + safeZoneW - POS_W(POS_EDGE(12.5,11) + IMAGE_HEIGHT * _ratio + 3 * BORDER_SIZE)); + _ctrlGroup ctrlSetPositionX (safeZoneX + safeZoneW - POS_W(POS_EDGE_SQF(12.5,11) + IMAGE_HEIGHT * _ratio + 3 * BORDER_SIZE)); _ctrlGroup ctrlSetPositionY (getMousePosition select 1) min (safeZoneY + safeZoneH - POS_H(IMAGE_HEIGHT + 3 * BORDER_SIZE)); _ctrlGroup ctrlSetPositionW POS_W(IMAGE_HEIGHT * _ratio + 2 * BORDER_SIZE); _ctrlGroup ctrlCommit 0; diff --git a/addons/editor_previews/gui.hpp b/addons/editor_previews/gui.hpp index 8968d8ab5..601eff565 100644 --- a/addons/editor_previews/gui.hpp +++ b/addons/editor_previews/gui.hpp @@ -7,7 +7,7 @@ class GVAR(control): ctrlControlsGroupNoScrollbars { x = 0; y = 0; w = 0; - h = POS_H(IMAGE_HEIGHT + 2 * BORDER_SIZE); + h = QUOTE(POS_H(IMAGE_HEIGHT + 2 * BORDER_SIZE)); class controls { class Background: ctrlStatic { idc = -1; @@ -19,10 +19,10 @@ class GVAR(control): ctrlControlsGroupNoScrollbars { }; class Image: ctrlStaticPictureKeepAspect { idc = IDC_PREVIEW_IMAGE; - x = POS_W(BORDER_SIZE); - y = POS_H(BORDER_SIZE); + x = QUOTE(POS_W(BORDER_SIZE)); + y = QUOTE(POS_H(BORDER_SIZE)); w = 0; - h = POS_H(IMAGE_HEIGHT); + h = QUOTE(POS_H(IMAGE_HEIGHT)); }; }; }; diff --git a/addons/editor_previews/initSettings.sqf b/addons/editor_previews/initSettings.inc.sqf similarity index 100% rename from addons/editor_previews/initSettings.sqf rename to addons/editor_previews/initSettings.inc.sqf diff --git a/addons/flashlight/XEH_preInit.sqf b/addons/flashlight/XEH_preInit.sqf index bcd75d7c4..5acf83d25 100644 --- a/addons/flashlight/XEH_preInit.sqf +++ b/addons/flashlight/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initKeybinds.sqf" +#include "initKeybinds.inc.sqf" GVAR(state) = false; GVAR(light) = objNull; diff --git a/addons/flashlight/initKeybinds.sqf b/addons/flashlight/initKeybinds.inc.sqf similarity index 100% rename from addons/flashlight/initKeybinds.sqf rename to addons/flashlight/initKeybinds.inc.sqf diff --git a/addons/garage/XEH_preInit.sqf b/addons/garage/XEH_preInit.sqf index 1c32c3e3f..71d3991bf 100644 --- a/addons/garage/XEH_preInit.sqf +++ b/addons/garage/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(currentTab) = -1; GVAR(helperPos) = [0, 0, -1]; diff --git a/addons/garage/functions/fnc_onTabSelect.sqf b/addons/garage/functions/fnc_onTabSelect.sqf index 30ecf96d8..9576d9755 100644 --- a/addons/garage/functions/fnc_onTabSelect.sqf +++ b/addons/garage/functions/fnc_onTabSelect.sqf @@ -36,7 +36,7 @@ _ctrlEmpty ctrlCommit 0; { private _active = _selectedTab == _forEachIndex; - private _fade = [1, 0] select _active; + private _fade = parseNumber !_active; private _fadeTime = [0, FADE_DELAY] select (_active && {!_forced}); private _ctrlBackground = _display displayCtrl (_x - 1); diff --git a/addons/garage/gui.hpp b/addons/garage/gui.hpp index a1719fc16..59930aad8 100644 --- a/addons/garage/gui.hpp +++ b/addons/garage/gui.hpp @@ -14,14 +14,14 @@ class GVAR(display) { class controlsBackground { class BlackLeft: RscText { idc = -1; - x = safeZoneXAbs; - y = safeZoneY; - w = safeZoneXAbs - safeZoneX; - h = safeZoneH; + x = QUOTE(safeZoneXAbs); + y = QUOTE(safeZoneY); + w = QUOTE(safeZoneXAbs - safeZoneX); + h = QUOTE(safeZoneH); colorBackground[] = {0, 0, 0, 1}; }; class BlackRight: BlackLeft { - x = safeZoneX + safeZoneW; + x = QUOTE(safeZoneX + safeZoneW); }; class MouseArea: RscText { idc = IDC_MOUSEAREA; @@ -30,19 +30,19 @@ class GVAR(display) { onMouseZChanged = QUOTE(_this call FUNC(onMouseZChanged)); onMouseButtonClick = QUOTE(_this call FUNC(onMouseButtonClick)); style = ST_MULTI; - x = safeZoneX; - y = safeZoneY; - w = safeZoneW; - h = safeZoneH; + x = QUOTE(safeZoneX); + y = QUOTE(safeZoneY); + w = QUOTE(safeZoneW); + h = QUOTE(safeZoneH); }; }; class controls { class MenuBar: RscControlsGroupNoScrollbars { idc = IDC_MENU_BAR; - x = safeZoneX + POS_W(0.5); - y = safeZoneY + safezoneH - POS_H(1.5); - w = safeZoneW - POS_W(1); - h = POS_H(1); + x = QUOTE(safeZoneX + POS_W(0.5)); + y = QUOTE(safeZoneY + safezoneH - POS_H(1.5)); + w = QUOTE(safeZoneW - POS_W(1)); + h = QUOTE(POS_H(1)); class controls { class ButtonClose: RscButtonMenu { onButtonClick = QUOTE(_this call FUNC(closeGarage)); @@ -50,71 +50,71 @@ class GVAR(display) { tooltip = CSTRING(Close_Tooltip); x = 0; y = 0; - w = (safeZoneW - POS_W(1)) / 5; - h = POS_H(1); + w = QUOTE((safeZoneW - POS_W(1)) / 5); + h = QUOTE(POS_H(1)); }; class ButtonHide: ButtonClose { onButtonClick = QUOTE(_this call FUNC(toggleInterface)); text = "$STR_CA_HIDE"; tooltip = CSTRING(Hide_Tooltip); - x = (safeZoneW - POS_W(1)) / 5 + POS_W(0.1); - w = (safeZoneW - POS_W(1)) / 8; + x = QUOTE((safeZoneW - POS_W(1)) / 5 + POS_W(0.1)); + w = QUOTE((safeZoneW - POS_W(1)) / 8); }; class ButtonApply: ButtonHide { idc = IDC_BUTTON_APPLY; onButtonClick = QUOTE(_this call FUNC(applyToAll)); text = CSTRING(ApplyToAll); tooltip = CSTRING(ApplyToAll_Tooltip); - x = (safeZoneW - POS_W(1)) / 5 + (safeZoneW - POS_W(1)) / 8 + POS_W(0.2); + x = QUOTE((safeZoneW - POS_W(1)) / 5 + (safeZoneW - POS_W(1)) / 8 + POS_W(0.2)); }; }; }; class InfoGroup: RscControlsGroupNoScrollbars { idc = IDC_INFO_GROUP; - x = safeZoneX + safeZoneW - POS_W(20.1); - y = safeZoneY + safeZoneH - POS_H(4.5); - w = POS_W(17.6); - h = POS_H(3); + x = QUOTE(safeZoneX + safeZoneW - POS_W(20.1)); + y = QUOTE(safeZoneY + safeZoneH - POS_H(4.5)); + w = QUOTE(POS_W(17.6)); + h = QUOTE(POS_H(3)); class controls { class Background: RscText { idc = -1; - x = POS_W(2.6); + x = QUOTE(POS_W(2.6)); y = 0; - w = POS_W(15); - h = POS_H(2.5); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(2.5)); colorBackground[] = {0, 0, 0, 0.8}; }; class InfoName: RscText { idc = IDC_INFO_NAME; - x = POS_W(2.6); - y = POS_H(0); - w = POS_W(15); - h = POS_H(1.5); - sizeEx = POS_H(1.5); + x = QUOTE(POS_W(2.6)); + y = QUOTE(POS_H(0)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(1.5)); + sizeEx = QUOTE(POS_H(1.5)); }; class InfoAuthor: RscText { idc = IDC_INFO_AUTHOR; - x = POS_W(2.6); - y = POS_H(1); - w = POS_W(15); - h = POS_H(1.5); - sizeEx = POS_H(0.8); + x = QUOTE(POS_W(2.6)); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(1.5)); + sizeEx = QUOTE(POS_H(0.8)); colorText[] = {1, 1, 1, 0.5}; }; class DLCBackground: RscText { idc = IDC_DLC_BACKGROUND; x = 0; y = 0; - w = POS_W(2.5); - h = POS_H(2.5); + w = QUOTE(POS_W(2.5)); + h = QUOTE(POS_H(2.5)); colorBackground[] = {0, 0, 0, 0.5}; }; class DLCIcon: RscActivePicture { idc = IDC_DLC_ICON; x = 0; y = 0; - w = POS_W(2.5); - h = POS_H(2.5); + w = QUOTE(POS_W(2.5)); + h = QUOTE(POS_H(2.5)); color[] = {1, 1, 1, 1}; colorActive[] = {1, 1, 1, 1}; }; @@ -122,10 +122,10 @@ class GVAR(display) { }; class BackgroundAnimations: RscText { idc = IDC_BACKGROUND_ANIMATIONS; - x = safeZoneX; - y = safeZoneY + POS_H(0.5); - w = POS_W(3.5); - h = POS_H(2); + x = QUOTE(safeZoneX); + y = QUOTE(safeZoneY + POS_H(0.5)); + w = QUOTE(POS_W(3.5)); + h = QUOTE(POS_H(2)); colorBackground[] = {0, 0, 0, 1}; }; class ButtonAnimations: RscButtonArsenal { @@ -133,47 +133,47 @@ class GVAR(display) { onButtonClick = QUOTE(0 call FUNC(onTabSelect)); text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayGarage\AnimationSources_ca.paa"; tooltip = "$STR_A3_RscDisplayGarage_tab_AnimationSources"; - x = safeZoneX + POS_W(0.5); - y = safeZoneY + POS_H(0.5); - w = POS_W(2); - h = POS_H(2); + x = QUOTE(safeZoneX + POS_W(0.5)); + y = QUOTE(safeZoneY + POS_H(0.5)); + w = QUOTE(POS_W(2)); + h = QUOTE(POS_H(2)); colorBackground[] = {0, 0, 0, 0.5}; }; class BackgroundTextures: BackgroundAnimations { idc = IDC_BACKGROUND_TEXTURES; - y = safeZoneY + POS_H(2.8); + y = QUOTE(safeZoneY + POS_H(2.8)); }; class ButtonTextures: ButtonAnimations { idc = IDC_BUTTON_TEXTURES; onButtonClick = QUOTE(1 call FUNC(onTabSelect)); text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayGarage\TextureSources_ca.paa"; tooltip = "$STR_A3_RscDisplayGarage_tab_TextureSources"; - y = safeZoneY + POS_H(2.8); + y = QUOTE(safeZoneY + POS_H(2.8)); }; class ListBackground: RscText { idc = IDC_LIST_BACKGROUND; - x = safeZoneX + POS_W(3.5); - y = safeZoneY + POS_H(0.5); - w = POS_W(13); - h = safeZoneH - POS_H(2.5); + x = QUOTE(safeZoneX + POS_W(3.5)); + y = QUOTE(safeZoneY + POS_H(0.5)); + w = QUOTE(POS_W(13)); + h = QUOTE(safeZoneH - POS_H(2.5)); colorBackground[] = {0, 0, 0, 0.5}; }; class ListFrame: RscFrame { idc = IDC_LIST_FRAME; - x = safeZoneX + POS_W(3.5); - y = safeZoneY + POS_H(0.5); - w = POS_W(13); - h = safeZoneH - POS_H(2.5); + x = QUOTE(safeZoneX + POS_W(3.5)); + y = QUOTE(safeZoneY + POS_H(0.5)); + w = QUOTE(POS_W(13)); + h = QUOTE(safeZoneH - POS_H(2.5)); colorText[] = {0, 0, 0, 1}; }; class ListAnimations: RscListBox { idc = IDC_LIST_ANIMATIONS; onLBSelChanged = QUOTE(_this call FUNC(onAnimationSelect)); - x = safeZoneX + POS_W(3.5); - y = safeZoneY + POS_H(0.5); - w = POS_W(13); - h = safeZoneH - POS_H(2.5); - sizeEx = POS_H(1.2); + x = QUOTE(safeZoneX + POS_W(3.5)); + y = QUOTE(safeZoneY + POS_H(0.5)); + w = QUOTE(POS_W(13)); + h = QUOTE(safeZoneH - POS_H(2.5)); + sizeEx = QUOTE(POS_H(1.2)); colorSelect[] = {1, 1, 1, 1}; colorSelect2[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0}; @@ -190,11 +190,11 @@ class GVAR(display) { idc = IDC_LIST_EMPTY; style = ST_CENTER; text = "$STR_lib_info_na"; - x = safeZoneX + POS_W(3.5); - y = safeZoneY + POS_H(0.5); - w = POS_W(13); - h = safeZoneH - POS_H(2.5); - sizeEx = POS_H(2); + x = QUOTE(safeZoneX + POS_W(3.5)); + y = QUOTE(safeZoneY + POS_H(0.5)); + w = QUOTE(POS_W(13)); + h = QUOTE(safeZoneH - POS_H(2.5)); + sizeEx = QUOTE(POS_H(2)); colorText[] = {1, 1, 1, 0.15}; shadow = 0; }; diff --git a/addons/garage/initSettings.sqf b/addons/garage/initSettings.inc.sqf similarity index 100% rename from addons/garage/initSettings.sqf rename to addons/garage/initSettings.inc.sqf diff --git a/addons/inventory/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf index d549bdf95..541ce1f62 100644 --- a/addons/inventory/XEH_preInit.sqf +++ b/addons/inventory/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" // Add inventory button to attribute display [ diff --git a/addons/inventory/gui.hpp b/addons/inventory/gui.hpp index 3bcea1c79..f0dfcff0b 100644 --- a/addons/inventory/gui.hpp +++ b/addons/inventory/gui.hpp @@ -26,22 +26,22 @@ class GVAR(display): EGVAR(common,RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(13/3 + 15.3); + h = QUOTE(POS_H(13/3 + 15.3)); class controls { class CategoryBackground: RscText { idc = -1; x = 0; y = 0; - w = POS_W(26); - h = POS_H(13/3 + 1); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(13/3 + 1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Category: ctrlToolboxPictureKeepAspect { idc = IDC_CATEGORY; x = 0; y = 0; - w = POS_W(26); - h = POS_H(13/3); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(13/3)); colorBackground[] = {0, 0, 0, 0}; rows = 2; columns = 12; @@ -76,30 +76,30 @@ class GVAR(display): EGVAR(common,RscDisplay) { idc = IDC_WEAPON_GROUP; x = 0; y = 0; - w = POS_W(26); - h = POS_H(13/3); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(13/3)); show = 0; class controls { class Title: RscText { idc = IDC_WEAPON_TITLE; x = 0; y = 0; - w = POS_W(25); - h = POS_H(1); + w = QUOTE(POS_W(25)); + h = QUOTE(POS_H(1)); }; class Picture: ctrlStaticPictureKeepAspect { idc = IDC_WEAPON_PICTURE; x = 0; - y = POS_H(1); - w = POS_W(28/3); - h = POS_H(10/3); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(28/3)); + h = QUOTE(POS_H(10/3)); }; class Category: ctrlToolboxPictureKeepAspect { idc = IDC_WEAPON_CATEGORY; - x = POS_W(28/3); - y = POS_H(1); - w = POS_W(50/3); - h = POS_H(10/3); + x = QUOTE(POS_W(28/3)); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(50/3)); + h = QUOTE(POS_H(10/3)); colorBackground[] = {0, 0, 0, 0}; rows = 1; columns = 5; @@ -115,10 +115,10 @@ class GVAR(display): EGVAR(common,RscDisplay) { idc = IDC_WEAPON_CLOSE; text = "\a3\3den\data\displays\display3den\search_end_ca.paa"; tooltip = CSTRING(Close_Tooltip); - x = POS_W(25); + x = QUOTE(POS_W(25)); y = 0; - w = POS_W(1); - h = POS_H(1); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; }; }; @@ -126,10 +126,10 @@ class GVAR(display): EGVAR(common,RscDisplay) { class Sorting: ctrlListNBox { idc = IDC_SORTING; x = 0; - y = POS_H(13/3); - w = POS_W(26); - h = POS_H(1); - sizeEx = POS_H(0.85); + y = QUOTE(POS_H(13/3)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(0.85)); disableOverflow = 1; columns[] = {0, 0.8}; class Items { @@ -145,18 +145,18 @@ class GVAR(display): EGVAR(common,RscDisplay) { }; class ListBackground: EGVAR(common,RscBackground) { x = 0; - y = POS_H(13/3 + 1); - w = POS_W(26); - h = POS_H(13); + y = QUOTE(POS_H(13/3 + 1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(13)); }; class List: ctrlListNBox { idc = IDC_LIST; idcLeft = IDC_BTN_REMOVE; idcRight = IDC_BTN_ADD; x = 0; - y = POS_H(13/3 + 1); - w = POS_W(26); - h = POS_H(13); + y = QUOTE(POS_H(13/3 + 1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(13)); drawSideArrows = 1; disableOverflow = 1; tooltipPerColumn = 0; @@ -168,9 +168,9 @@ class GVAR(display): EGVAR(common,RscDisplay) { font = "RobotoCondensedBold"; x = -1; y = -1; - w = POS_W(1); - h = POS_H(1); - sizeEx = POS_H(1.2); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(1.2)); }; class ButtonAdd: ButtonRemove { idc = IDC_BTN_ADD; @@ -181,44 +181,44 @@ class GVAR(display): EGVAR(common,RscDisplay) { text = "\a3\Ui_f\data\GUI\RscCommon\RscButtonSearch\search_start_ca.paa"; tooltip = CSTRING(Search_Tooltip); x = 0; - y = POS_H(13/3 + 14.3); - w = POS_W(1); - h = POS_H(1); + y = QUOTE(POS_H(13/3 + 14.3)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class SearchBar: EGVAR(common,RscEdit) { idc = IDC_SEARCH_BAR; - x = POS_W(1.2); - y = POS_H(13/3 + 14.3); - w = POS_W(8); - h = POS_H(1); - sizeEx = POS_H(0.9); + x = QUOTE(POS_W(1.2)); + y = QUOTE(POS_H(13/3 + 14.3)); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(0.9)); }; class Load: ctrlProgress { idc = IDC_LOAD_BAR; - x = POS_W(14.4); - y = POS_H(13/3 + 14.4); - w = POS_W(8); - h = POS_H(0.8); + x = QUOTE(POS_W(14.4)); + y = QUOTE(POS_H(13/3 + 14.4)); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(0.8)); colorFrame[] = {1, 1, 1, 1}; }; class ButtonWeapon: ButtonSearch { idc = IDC_BTN_WEAPON; text = "\a3\3den\data\displays\display3den\entitymenu\arsenal_ca.paa"; tooltip = CSTRING(Weapon_Tooltip); - x = POS_W(22.6); + x = QUOTE(POS_W(22.6)); }; class ButtonReset: ButtonSearch { idc = IDC_BTN_RESET; text = QPATHTOF(ui\reset_ca.paa); tooltip = CSTRING(Reset_Tooltip); - x = POS_W(23.8); + x = QUOTE(POS_W(23.8)); }; class ButtonClear: ButtonSearch { idc = IDC_BTN_CLEAR; text = "\a3\3den\data\cfg3den\history\deleteitems_ca.paa"; tooltip = CSTRING(Clear_Tooltip); - x = POS_W(25); + x = QUOTE(POS_W(25)); }; }; }; diff --git a/addons/inventory/initSettings.sqf b/addons/inventory/initSettings.inc.sqf similarity index 100% rename from addons/inventory/initSettings.sqf rename to addons/inventory/initSettings.inc.sqf diff --git a/addons/loadout/gui.hpp b/addons/loadout/gui.hpp index 17ac9198a..b693e6f72 100644 --- a/addons/loadout/gui.hpp +++ b/addons/loadout/gui.hpp @@ -21,29 +21,29 @@ class GVAR(display): EGVAR(common,RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(18.9); + h = QUOTE(POS_H(18.9)); class controls { class Weapon: EGVAR(common,RscCombo) { idc = IDC_WEAPON; x = 0; y = 0; - w = POS_W(26); - h = POS_H(1); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); }; class ListBackground: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(16.6); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(16.6)); }; class List: ctrlListNBox { idc = IDC_LIST; idcLeft = IDC_BTN_REMOVE; idcRight = IDC_BTN_ADD; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(16.6); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(16.6)); drawSideArrows = 1; disableOverflow = 1; columns[] = {0.05, 0.55, 0.85}; @@ -54,9 +54,9 @@ class GVAR(display): EGVAR(common,RscDisplay) { font = "RobotoCondensedBold"; x = -1; y = -1; - w = POS_W(1); - h = POS_H(1); - sizeEx = POS_H(1.2); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(1.2)); }; class ButtonAdd: ButtonRemove { idc = IDC_BTN_ADD; @@ -66,26 +66,26 @@ class GVAR(display): EGVAR(common,RscDisplay) { idc = IDC_BTN_SEARCH; text = "\a3\Ui_f\data\GUI\RscCommon\RscButtonSearch\search_start_ca.paa"; x = 0; - y = POS_H(17.9); - w = POS_W(1); - h = POS_H(1); + y = QUOTE(POS_H(17.9)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; offsetPressedX = 0; offsetPressedY = 0; }; class SearchBar: EGVAR(common,RscEdit) { idc = IDC_SEARCH_BAR; - x = POS_W(1.2); - y = POS_H(17.9); - w = POS_W(8); - h = POS_H(1); - sizeEx = POS_H(0.9); + x = QUOTE(POS_W(1.2)); + y = QUOTE(POS_H(17.9)); + w = QUOTE(POS_W(8)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(0.9)); }; class ButtonClear: ButtonSearch { idc = IDC_BTN_CLEAR; text = "\a3\3den\data\cfg3den\history\deleteitems_ca.paa"; tooltip = "$STR_disp_arcmap_clear"; - x = POS_W(25); + x = QUOTE(POS_W(25)); }; }; }; diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 3713d17d0..b5a1d91f8 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -100,7 +100,8 @@ #define COLOR_BACKGROUND_SETTING COLOR_SETTING(EGVAR(common,darkMode),1,1,1,0.1,0,0,0,0.2) -#define POS_EDGE(DEFAULT,MOVED) ([ARR_2(DEFAULT,MOVED)] select GETMVAR(EGVAR(editor,moveDisplayToEdge),false)) +#define POS_EDGE(DEFAULT,MOVED) ([ARR_2(DEFAULT,MOVED)] select (missionNamespace getVariable [ARR_2(QQEGVAR(editor,moveDisplayToEdge),false)])) +#define POS_EDGE_SQF(DEFAULT,MOVED) ([ARR_2(DEFAULT,MOVED)] select GETMVAR(EGVAR(editor,moveDisplayToEdge),false)) #define ASCII_NEWLINE 10 #define ASCII_PERIOD 46 diff --git a/addons/markers_tree/RscDisplayCurator.hpp b/addons/markers_tree/RscDisplayCurator.hpp index 0a18cbc4b..959d9ad2d 100644 --- a/addons/markers_tree/RscDisplayCurator.hpp +++ b/addons/markers_tree/RscDisplayCurator.hpp @@ -9,16 +9,16 @@ class RscDisplayCurator { idc = IDC_MARKERS_MODE_ICONS; text = "\a3\3den\data\displays\display3den\panelright\submode_marker_icon_ca.paa"; tooltip = "$STR_3DEN_Marker_Mode_Icon"; - x = POS_W(7.4/3); - y = POS_H(2.1); - w = POS_W(1.8); - h = POS_H(1.8); + x = QUOTE(POS_W(7.4/3)); + y = QUOTE(POS_H(2.1)); + w = QUOTE(POS_W(1.8)); + h = QUOTE(POS_H(1.8)); }; class GVAR(modeAreas): GVAR(modeIcons) { idc = IDC_MARKERS_MODE_AREAS; text = "\a3\3den\data\displays\display3den\panelright\submode_marker_area_ca.paa"; tooltip = "$STR_3DEN_Marker_Mode_Area"; - x = POS_W(1.8 + 2 * 7.4/3); + x = QUOTE(POS_W(1.8 + 2 * 7.4/3)); }; class CreateUnitsWest; class CreateMarkers: CreateUnitsWest { diff --git a/addons/modules/CfgVehicles.hpp b/addons/modules/CfgVehicles.hpp index 6f6798c30..6ea4d82a5 100644 --- a/addons/modules/CfgVehicles.hpp +++ b/addons/modules/CfgVehicles.hpp @@ -41,7 +41,7 @@ class CfgVehicles { class GVAR(moduleAddFullArsenal): GVAR(moduleBase) { curatorCanAttach = 1; - category = GVAR(Inventory); + category = QGVAR(Inventory); displayName = CSTRING(ModuleAddFullArsenal); function = QFUNC(moduleAddFullArsenal); icon = "\a3\ui_f\data\logos\a_64_ca.paa"; @@ -329,14 +329,14 @@ class CfgVehicles { }; class GVAR(moduleRemoveArsenal): GVAR(moduleBase) { curatorCanAttach = 1; - category = GVAR(Inventory); + category = QGVAR(Inventory); displayName = CSTRING(ModuleRemoveArsenal); function = QFUNC(moduleRemoveArsenal); icon = "\a3\ui_f\data\logos\a_64_ca.paa"; }; class GVAR(moduleRotateObject): GVAR(moduleBase) { curatorCanAttach = 1; - category = GVAR(Objects); + category = QGVAR(Objects); displayName = CSTRING(RotateObject); function = QFUNC(moduleRotateObject); icon = QPATHTOF(ui\rotate_ca.paa); diff --git a/addons/modules/gui.hpp b/addons/modules/gui.hpp index 103a653df..72a011fa5 100644 --- a/addons/modules/gui.hpp +++ b/addons/modules/gui.hpp @@ -41,10 +41,10 @@ class GVAR(RscDisplay): EGVAR(common,RscDisplay) { class GVAR(RscToolboxYesNo): ctrlToolbox { idc = -1; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(15.9); - h = POS_H(1); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,No), ECSTRING(common,Yes)}; @@ -87,70 +87,70 @@ class GVAR(RscAmbientFlyby): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(11); + h = QUOTE(POS_H(11)); class controls { class AircraftSelect: RscControlsGroupNoScrollbars { idc = -1; x = 0; y = 0; - w = POS_W(26); - h = POS_H(4.4); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(4.4)); class controls { class Title: EGVAR(common,RscLabel) { text = CSTRING(ModuleAmbientFlyby_AircraftSelect); - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(3.4); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(3.4)); }; class SideLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Side); - x = POS_W(3); - y = POS_H(1.1); - w = POS_W(8.9); + x = QUOTE(POS_W(3)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(8.9)); colorBackground[] = {0, 0, 0, 0.7}; }; class SideCombo: GVAR(RscSidesCombo) { idc = IDC_AMBIENTFLYBY_SIDE; - x = POS_W(12); - y = POS_H(1.1); - w = POS_W(11); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(11)); }; class FactionLabel: SideLabel { text = ECSTRING(common,Faction); - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); }; class FactionCombo: SideCombo { idc = IDC_AMBIENTFLYBY_FACTION; - y = POS_H(2.2); - wholeHeight = POS_H(6); + y = QUOTE(POS_H(2.2)); + wholeHeight = QUOTE(POS_H(6)); class Items {}; }; class AircraftLabel: FactionLabel { text = ECSTRING(common,Aircraft); - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); }; class AircraftCombo: FactionCombo { idc = IDC_AMBIENTFLYBY_AIRCRAFT; - y = POS_H(3.3); - wholeHeight = POS_H(5); + y = QUOTE(POS_H(3.3)); + wholeHeight = QUOTE(POS_H(5)); }; }; }; class DirectionLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleAmbientFlyby_FlyTowards); tooltip = CSTRING(ModuleAmbientFlyby_FlyTowards_Tooltip); - y = POS_H(4.5); + y = QUOTE(POS_H(4.5)); }; class Direction: ctrlToolbox { idc = IDC_AMBIENTFLYBY_DIRECTION; - x = POS_W(10.1); - y = POS_H(4.5); - w = POS_W(15.9); - h = POS_H(1); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(4.5)); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); rows = 1; columns = 8; strings[] = {"N", "NE", "E", "SE", "S", "SW", "W", "NW"}; @@ -158,12 +158,12 @@ class GVAR(RscAmbientFlyby): GVAR(RscDisplay) { class HeightLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Height); tooltip = CSTRING(ModuleAmbientFlyby_Height_Tooltip); - y = POS_H(5.6); - h = POS_H(2.1); + y = QUOTE(POS_H(5.6)); + h = QUOTE(POS_H(2.1)); }; class HeightMode: Direction { idc = IDC_AMBIENTFLYBY_HEIGHT_MODE; - y = POS_H(5.6); + y = QUOTE(POS_H(5.6)); columns = 2; strings[] = { CSTRING(ModuleAmbientFlyby_Height_Mode_AGL), @@ -176,50 +176,50 @@ class GVAR(RscAmbientFlyby): GVAR(RscDisplay) { }; class HeightSlider: ctrlXSliderH { idc = IDC_AMBIENTFLYBY_HEIGHT_SLIDER; - x = POS_W(10.1); - y = POS_H(6.7); - w = POS_W(13.4); - h = POS_H(1); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(6.7)); + w = QUOTE(POS_W(13.4)); + h = QUOTE(POS_H(1)); }; class HeightEdit: EGVAR(common,RscEdit) { idc = IDC_AMBIENTFLYBY_HEIGHT_EDIT; - x = POS_W(23.6); - y = POS_H(6.7); - w = POS_W(2.4); - h = POS_H(1); + x = QUOTE(POS_W(23.6)); + y = QUOTE(POS_H(6.7)); + w = QUOTE(POS_W(2.4)); + h = QUOTE(POS_H(1)); }; class DistanceLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleAmbientFlyby_Distance); tooltip = CSTRING(ModuleAmbientFlyby_Distance_Tooltip); - y = POS_H(7.8); + y = QUOTE(POS_H(7.8)); }; class DistanceSlider: HeightSlider { idc = IDC_AMBIENTFLYBY_DISTANCE_SLIDER; - y = POS_H(7.8); + y = QUOTE(POS_H(7.8)); }; class DistanceEdit: HeightEdit { idc = IDC_AMBIENTFLYBY_DISTANCE_EDIT; - y = POS_H(7.8); + y = QUOTE(POS_H(7.8)); }; class SpeedLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Speed); tooltip = CSTRING(ModuleAmbientFlyby_Speed_Tooltip); - y = POS_H(8.9); + y = QUOTE(POS_H(8.9)); }; class Speed: Direction { idc = IDC_AMBIENTFLYBY_SPEED; - y = POS_H(8.9); + y = QUOTE(POS_H(8.9)); columns = 3; strings[] = {"$STR_A3_Slow", "$STR_A3_Normal", "$STR_A3_Fast"}; }; class AmountLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleAmbientFlyby_Amount); tooltip = CSTRING(ModuleAmbientFlyby_Amount_Tooltip); - y = POS_H(10); + y = QUOTE(POS_H(10)); }; class Amount: Direction { idc = IDC_AMBIENTFLYBY_AMOUNT; - y = POS_H(10); + y = QUOTE(POS_H(10)); columns = 6; strings[] = {"1", "2", "3", "4", "5", "6"}; }; @@ -237,24 +237,24 @@ class GVAR(RscCAS): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(8); + h = QUOTE(POS_H(8)); class controls { class Label: EGVAR(common,RscLabel) { text = "$STR_DN_Plane"; - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(7); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(7)); }; class List: ctrlListNBox { idc = IDC_CAS_LIST; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(7); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(7)); columns[] = {0, 0.1, 0.25}; }; }; @@ -270,52 +270,52 @@ class GVAR(RscDamageBuildings): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(4.2); + h = QUOTE(POS_H(4.2)); class controls { class SelectionLabel: EGVAR(common,RscLabel) { text = CSTRING(BuildingSelection); }; class SelectionMode: ctrlToolbox { idc = IDC_DAMAGEBUILDINGS_MODE; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(13.8) - pixelW; - h = POS_H(1); + w = QUOTE(POS_W(13.8) - pixelW); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,Nearest), ECSTRING(common,Radius)}; }; class SelectionRadius: EGVAR(common,RscEdit) { idc = IDC_DAMAGEBUILDINGS_RADIUS; - x = POS_W(24); - w = POS_W(2); + x = QUOTE(POS_W(24)); + w = QUOTE(POS_W(2)); maxChars = 4; }; class DamageLabel: EGVAR(common,RscLabel) { text = CSTRING(DamageState); tooltip = CSTRING(DamageState_Tooltip); - y = POS_H(1.1); - h = POS_H(2); + y = QUOTE(POS_H(1.1)); + h = QUOTE(POS_H(2)); }; class DamageBlockLeft: RscText { idc = -1; - x = POS_W(10.1); - y = POS_H(1.1); - w = POS_W(10); - h = POS_H(2); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(10)); + h = QUOTE(POS_H(2)); colorBackground[] = {0, 0, 0, 0.5}; }; class DamageblockRight: DamageBlockLeft { - x = POS_W(20.2); - w = POS_W(5.8); + x = QUOTE(POS_W(20.2)); + w = QUOTE(POS_W(5.8)); }; class Undamaged: EGVAR(common,RscCheckbox) { idc = IDC_DAMAGEBUILDINGS_UNDAMAGED; tooltip = "$STR_a3_to_editTerrainObject15"; - x = POS_W(10.1); - y = POS_H(1.1); - w = POS_W(2); - h = POS_H(2); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(2)); + h = QUOTE(POS_H(2)); color[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0}; colorBackgroundHover[] = {0, 0, 0, 0}; @@ -327,35 +327,35 @@ class GVAR(RscDamageBuildings): GVAR(RscDisplay) { class Damaged_1: Undamaged { idc = IDC_DAMAGEBUILDINGS_DAMAGED_1; tooltip = "$STR_a3_to_editTerrainObject16"; - x = POS_W(12.1); + x = QUOTE(POS_W(12.1)); CHECKBOX_TEXTURES(ICON_DAMAGED_1_UNCHECKED,ICON_DAMAGED_1_CHECKED); }; class Damaged_2: Undamaged { idc = IDC_DAMAGEBUILDINGS_DAMAGED_2; tooltip = "$STR_a3_to_editTerrainObject17"; - x = POS_W(14.1); + x = QUOTE(POS_W(14.1)); CHECKBOX_TEXTURES(ICON_DAMAGED_2_UNCHECKED,ICON_DAMAGED_2_CHECKED); }; class Damaged_3: Undamaged { idc = IDC_DAMAGEBUILDINGS_DAMAGED_3; tooltip = "$STR_a3_to_editTerrainObject18"; - x = POS_W(16.1); + x = QUOTE(POS_W(16.1)); CHECKBOX_TEXTURES(ICON_DAMAGED_3_UNCHECKED,ICON_DAMAGED_3_CHECKED); }; class Destroyed: Undamaged { idc = IDC_DAMAGEBUILDINGS_DESTROYED; tooltip = "$STR_a3_to_editTerrainObject19"; - x = POS_W(18.1); + x = QUOTE(POS_W(18.1)); CHECKBOX_TEXTURES(ICON_DESTROYED_UNCHECKED,ICON_DESTROYED_CHECKED); }; class EffectsLabel: EGVAR(common,RscLabel) { text = CSTRING(DestructionEffects); tooltip = CSTRING(DestructionEffects_Tooltip); - y = POS_H(3.2); + y = QUOTE(POS_H(3.2)); }; class Effects: GVAR(RscToolboxYesNo) { idc = IDC_DAMAGEBUILDINGS_EFFECTS; - y = POS_H(3.2); + y = QUOTE(POS_H(3.2)); }; }; }; @@ -370,7 +370,7 @@ class GVAR(RscEditableObjects): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(8.2); + h = QUOTE(POS_H(8.2)); class controls { class EditingModeLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleEditableObjects_EditingMode); @@ -378,10 +378,10 @@ class GVAR(RscEditableObjects): GVAR(RscDisplay) { }; class EditingMode: ctrlToolbox { idc = IDC_EDITABLEOBJECTS_MODE; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(15.9); - h = POS_H(1); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {CSTRING(ModuleEditableObjects_RemoveObjects), CSTRING(ModuleEditableObjects_AddObjects)}; @@ -389,85 +389,85 @@ class GVAR(RscEditableObjects): GVAR(RscDisplay) { class AllCuratorsLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleEditableObjects_AllCurators); tooltip = CSTRING(ModuleEditableObjects_AllCurators_Tooltip); - y = POS_H(1.1); + y = QUOTE(POS_H(1.1)); }; class AllCurators: GVAR(RscToolboxYesNo) { idc = IDC_EDITABLEOBJECTS_CURATORS; - y = POS_H(1.1); + y = QUOTE(POS_H(1.1)); }; class RangeLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Range); - y = POS_H(2.2); - h = POS_H(2.1); + y = QUOTE(POS_H(2.2)); + h = QUOTE(POS_H(2.1)); }; class RangeMode: EditingMode { idc = IDC_EDITABLEOBJECTS_RANGE_MODE; - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); strings[] = {ECSTRING(common,Radius), CSTRING(ModuleEditableObjects_AllMissionObjects)}; }; class RangeSlider: ctrlXSliderH { idc = IDC_EDITABLEOBJECTS_RANGE_SLIDER; - x = POS_W(10.1); - y = POS_H(3.3); - w = POS_W(13.4); - h = POS_H(1); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(3.3)); + w = QUOTE(POS_W(13.4)); + h = QUOTE(POS_H(1)); }; class RangeEdit: EGVAR(common,RscEdit) { idc = IDC_EDITABLEOBJECTS_RANGE_EDIT; - x = POS_W(23.6); - y = POS_H(3.3); - w = POS_W(2.4); - h = POS_H(1); + x = QUOTE(POS_W(23.6)); + y = QUOTE(POS_H(3.3)); + w = QUOTE(POS_W(2.4)); + h = QUOTE(POS_H(1)); }; class FilterLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Filter); - y = POS_H(4.4); - h = POS_H(3.8); + y = QUOTE(POS_H(4.4)); + h = QUOTE(POS_H(3.8)); }; class FilterBackground: EGVAR(common,RscBackground) { - y = POS_H(4.4); - h = POS_H(3.8); + y = QUOTE(POS_H(4.4)); + h = QUOTE(POS_H(3.8)); }; class FilterAll: ctrlCheckbox { idc = IDC_EDITABLEOBJECTS_FILTER_ALL; - x = POS_W(10.1); - y = POS_H(4.5); - w = POS_W(0.9); - h = POS_H(0.9); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(4.5)); + w = QUOTE(POS_W(0.9)); + h = QUOTE(POS_H(0.9)); }; class FilterAllText: RscText { idc = -1; text = ECSTRING(common,All); - x = POS_W(11); - y = POS_H(4.5); - w = POS_W(10); - h = POS_H(0.9); - sizeEx = POS_H(0.9); + x = QUOTE(POS_W(11)); + y = QUOTE(POS_H(4.5)); + w = QUOTE(POS_W(10)); + h = QUOTE(POS_H(0.9)); + sizeEx = QUOTE(POS_H(0.9)); shadow = 0; }; class FilterUnits: FilterAll { idc = IDC_EDITABLEOBJECTS_FILTER_UNITS; - y = POS_H(5.4); + y = QUOTE(POS_H(5.4)); }; class FilterUnitsText: FilterAllText { text = ECSTRING(common,Units); - y = POS_H(5.4); + y = QUOTE(POS_H(5.4)); }; class FilterVehicles: FilterAll { idc = IDC_EDITABLEOBJECTS_FILTER_VEHICLES; - y = POS_H(6.3); + y = QUOTE(POS_H(6.3)); }; class FilterVehiclesText: FilterAllText { text = ECSTRING(common,Vehicles); - y = POS_H(6.3); + y = QUOTE(POS_H(6.3)); }; class FilterStatic: FilterAll { idc = IDC_EDITABLEOBJECTS_FILTER_STATIC; - y = POS_H(7.2); + y = QUOTE(POS_H(7.2)); }; class FilterStaticText: FilterAllText { text = ECSTRING(common,Static); - y = POS_H(7.2); + y = QUOTE(POS_H(7.2)); }; }; }; @@ -483,34 +483,34 @@ class GVAR(RscExecuteCode): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(15.2); + h = QUOTE(POS_H(15.2)); class controls { class History: EGVAR(common,RscCombo) { idc = IDC_EXECUTECODE_HISTORY; font = "EtelkaMonospacePro"; x = 0; - w = POS_W(26); - sizeEx = POS_H(0.7); + w = QUOTE(POS_W(26)); + sizeEx = QUOTE(POS_H(0.7)); }; class Edit: EGVAR(common,RscEdit) { idc = IDC_EXECUTECODE_EDIT; style = ST_MULTI; font = "EtelkaMonospacePro"; tooltip = CSTRING(ModuleExecuteCode_Args_Tooltip); - x = pixelW; - y = POS_H(1.1); - w = POS_W(26) - pixelW; - h = POS_H(13); - sizeEx = POS_H(0.7); + x = QUOTE(pixelW); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(26) - pixelW); + h = QUOTE(POS_H(13)); + sizeEx = QUOTE(POS_H(0.7)); autocomplete = "scripting"; default = 1; }; class Mode: ctrlToolbox { idc = IDC_EXECUTECODE_MODE; x = 0; - y = POS_H(14.2); - w = POS_W(26); - h = POS_H(1); + y = QUOTE(POS_H(14.2)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); rows = 1; columns = 4; strings[] = { @@ -533,33 +533,33 @@ class GVAR(RscFireMission): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(8.9); + h = QUOTE(POS_H(8.9)); class controls { class TargetingLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleFireMission_Targetting); - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class TargetingBackground: RscText { idc = -1; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(3.4); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(3.4)); colorBackground[] = {1, 1, 1, 0.1}; }; class ModeLabel: EGVAR(common,RscLabel) { text = CSTRING(ModuleFireMission_Mode); - x = POS_W(1); - y = POS_H(1.1); - w = POS_W(8); + x = QUOTE(POS_W(1)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(8)); colorBackground[] = {0, 0, 0, 0.6}; }; class Mode: ctrlToolbox { idc = IDC_FIREMISSION_MODE; - x = POS_W(9.1); - y = POS_H(1.1); - w = POS_W(15.9); - h = POS_H(1); + x = QUOTE(POS_W(9.1)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {CSTRING(ModuleFireMission_MapGrid), CSTRING(ModuleFireMission_TargetModule)}; @@ -567,70 +567,70 @@ class GVAR(RscFireMission): GVAR(RscDisplay) { class TargetLabel: ModeLabel { idc = IDC_FIREMISSION_TARGET_LABEL; text = "$STR_3den_display3den_menubar_grid_text"; - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); }; class TargetGrid: EGVAR(common,RscEdit) { idc = IDC_FIREMISSION_TARGET_GRID; - x = POS_W(9.1); - y = POS_H(2.2) + pixelH; + x = QUOTE(POS_W(9.1)); + y = QUOTE(POS_H(2.2) + pixelH); colorBackground[] = {0, 0, 0, 0.3}; }; class TargetLogic: EGVAR(common,RscCombo) { idc = IDC_FIREMISSION_TARGET_LOGIC; - x = POS_W(9.1); - y = POS_H(2.2); + x = QUOTE(POS_W(9.1)); + y = QUOTE(POS_H(2.2)); }; class SpreadLabel: ModeLabel { text = CSTRING(ModuleFireMission_Spread); tooltip = CSTRING(ModuleFireMission_Spread_Tooltip); - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); }; class SpreadSlider: ctrlXSliderH { idc = IDC_FIREMISSION_SPREAD_SLIDER; - x = POS_W(9.1); - y = POS_H(3.3); - w = POS_W(13.4); - h = POS_H(1); + x = QUOTE(POS_W(9.1)); + y = QUOTE(POS_H(3.3)); + w = QUOTE(POS_W(13.4)); + h = QUOTE(POS_H(1)); }; class SpreadEdit: EGVAR(common,RscEdit) { idc = IDC_FIREMISSION_SPREAD_EDIT; - x = POS_W(22.6); - y = POS_H(3.3); - w = POS_W(2.4); + x = QUOTE(POS_W(22.6)); + y = QUOTE(POS_H(3.3)); + w = QUOTE(POS_W(2.4)); colorBackground[] = {0, 0, 0, 0.3}; }; class FireParamsLabel: TargetingLabel { text = CSTRING(ModuleFireMission_FireParameters); - y = POS_H(4.5); + y = QUOTE(POS_H(4.5)); }; class FireParamsBackground: TargetingBackground { - y = POS_H(5.5); + y = QUOTE(POS_H(5.5)); }; class UnitsLabel: ModeLabel { text = CSTRING(ModuleFireMission_Units); tooltip = CSTRING(ModuleFireMission_Units_Tooltip); - y = POS_H(5.6); + y = QUOTE(POS_H(5.6)); }; class Units: TargetLogic { idc = IDC_FIREMISSION_UNITS; - y = POS_H(5.6); + y = QUOTE(POS_H(5.6)); }; class AmmoLabel: ModeLabel { text = CSTRING(ModuleFireMission_Ammo); - y = POS_H(6.7); + y = QUOTE(POS_H(6.7)); }; class Ammo: Units { idc = IDC_FIREMISSION_AMMO; - y = POS_H(6.7); + y = QUOTE(POS_H(6.7)); }; class RoundsLabel: ModeLabel { text = CSTRING(ModuleFireMission_Rounds); tooltip = CSTRING(ModuleFireMission_Rounds_Tooltip); - y = POS_H(7.8); + y = QUOTE(POS_H(7.8)); }; class Rounds: TargetGrid { idc = IDC_FIREMISSION_ROUNDS; - y = POS_H(7.8) + pixelH; + y = QUOTE(POS_H(7.8) + pixelH); }; }; }; @@ -645,30 +645,30 @@ class GVAR(RscGlobalHint): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(10); + h = QUOTE(POS_H(10)); class controls { class Edit: RscEditMulti { idc = IDC_GLOBALHINT_EDIT; - x = pixelW; - y = pixelH; - w = POS_W(13.2) - pixelW; - h = POS_H(10) - pixelH; + x = QUOTE(pixelW); + y = QUOTE(pixelH); + w = QUOTE(POS_W(13.2) - pixelW); + h = QUOTE(POS_H(10) - pixelH); colorBackground[] = {0.25, 0.25, 0.25, 0.1}; }; class Container: EGVAR(common,RscControlsGroup) { idc = -1; - x = POS_W(13.3); + x = QUOTE(POS_W(13.3)); y = 0; - w = POS_W(12.7); - h = POS_H(10); + w = QUOTE(POS_W(12.7)); + h = QUOTE(POS_H(10)); class controls { class Preview: RscStructuredText { idc = IDC_GLOBALHINT_PREVIEW; x = 0; y = 0; - w = POS_W(12.2); + w = QUOTE(POS_W(12.2)); h = 1; - size = POS_H(0.9); // Trial and error to get best representation of actual hint + size = QUOTE(POS_H(0.9)); // Trial and error to get best representation of actual hint colorBackground[] = {0, 0, 0, 0.6}; class Attributes { font = "RobotoCondensed"; @@ -693,29 +693,29 @@ class GVAR(RscSetDate): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(6.1); + h = QUOTE(POS_H(6.1)); class controls { class DateLabel: EGVAR(common,RscLabel) { text = "$STR_3DEN_Environment_Attribute_Date_displayName"; - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class DateBackground: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(2); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(2)); }; class Year: EGVAR(common,RscCombo) { idc = IDC_SETDATE_YEAR; font = "RobotoCondensedLight"; - x = POS_W(3.9); - y = POS_H(1.5); - w = POS_W(6); - sizeEx = POS_H(0.85); + x = QUOTE(POS_W(3.9)); + y = QUOTE(POS_H(1.5)); + w = QUOTE(POS_W(6)); + sizeEx = QUOTE(POS_H(0.85)); }; class Month: Year { idc = IDC_SETDATE_MONTH; - x = POS_W(10); + x = QUOTE(POS_W(10)); class Items { class Month1 { text = "$STR_3DEN_Attributes_Date_Month1_text"; @@ -769,29 +769,29 @@ class GVAR(RscSetDate): GVAR(RscDisplay) { }; class Day: Year { idc = IDC_SETDATE_DAY; - x = POS_W(16.1); + x = QUOTE(POS_W(16.1)); }; class TimeLabel: DateLabel { text = "$STR_3DEN_Environment_Attribute_Daytime_displayName"; - y = POS_H(3.1); + y = QUOTE(POS_H(3.1)); }; class TimeBackground: DateBackground { - y = POS_H(4.1); + y = QUOTE(POS_H(4.1)); }; class TimePreview: RscControlsGroupNoScrollbars { idc = IDC_SETDATE_PREVIEW; - x = POS_W(5.05); - y = POS_H(4.6); - w = POS_W(9.8); - h = POS_H(1); + x = QUOTE(POS_W(5.05)); + y = QUOTE(POS_H(4.6)); + w = QUOTE(POS_W(9.8)); + h = QUOTE(POS_H(1)); class controls { class Night1: RscPicture { idc = IDC_SETDATE_NIGHT1; text = "\a3\3DEN\Data\Attributes\SliderTimeDay\night_ca.paa"; x = 0; y = 0; - w = POS_W(0.5); - h = POS_H(1); + w = QUOTE(POS_W(0.5)); + h = QUOTE(POS_H(1)); colorText[] = {1, 1, 1, 0.6}; }; class Night2: Night1 { @@ -812,17 +812,17 @@ class GVAR(RscSetDate): GVAR(RscDisplay) { class Sun: Night1 { idc = IDC_SETDATE_SUN; text = "\a3\3DEN\Data\Attributes\SliderTimeDay\sun_ca.paa"; - x = POS_W(4.4); - w = POS_W(1); + x = QUOTE(POS_W(4.4)); + w = QUOTE(POS_W(1)); }; }; }; class Slider: ctrlXSliderH { idc = IDC_SETDATE_SLIDER; - x = POS_W(3.9); - y = POS_H(4.6); - w = POS_W(12.1); - h = POS_H(1); + x = QUOTE(POS_W(3.9)); + y = QUOTE(POS_H(4.6)); + w = QUOTE(POS_W(12.1)); + h = QUOTE(POS_H(1)); sliderRange[] = {0, 86399}; sliderPosition = 0; lineSize = 3600; @@ -835,10 +835,10 @@ class GVAR(RscSetDate): GVAR(RscDisplay) { style = ST_CENTER; text = ": :"; font = "EtelkaMonospacePro"; - x = POS_W(16.1); - y = POS_H(4.6); - w = POS_W(6); - h = POS_H(1); + x = QUOTE(POS_W(16.1)); + y = QUOTE(POS_H(4.6)); + w = QUOTE(POS_W(6)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Hour: EGVAR(common,RscEdit) { @@ -847,22 +847,22 @@ class GVAR(RscSetDate): GVAR(RscDisplay) { text = "00"; tooltip = "$STR_3DEN_Attributes_SliderTime_Hour_tooltip"; font = "EtelkaMonospacePro"; - x = POS_W(16.1); - y = POS_H(4.6); - w = POS_W(2); - sizeEx = POS_H(0.9); + x = QUOTE(POS_W(16.1)); + y = QUOTE(POS_H(4.6)); + w = QUOTE(POS_W(2)); + sizeEx = QUOTE(POS_H(0.9)); colorBackground[] = {0, 0, 0, 0}; maxChars = 2; }; class Minute: Hour { idc = IDC_SETDATE_MINUTE; tooltip = "$STR_3DEN_Attributes_SliderTime_Minute_tooltip"; - x = POS_W(18.1); + x = QUOTE(POS_W(18.1)); }; class Second: Hour { idc = IDC_SETDATE_SECOND; tooltip = "$STR_3DEN_Attributes_SliderTime_Second_tooltip"; - x = POS_W(20.1); + x = QUOTE(POS_W(20.1)); }; }; }; @@ -877,7 +877,7 @@ class GVAR(RscSideRelations): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(2.1); + h = QUOTE(POS_H(2.1)); class controls { class RelationLabel: EGVAR(common,RscLabel) { text = CSTRING(RelationToChange); @@ -886,10 +886,10 @@ class GVAR(RscSideRelations): GVAR(RscDisplay) { idc = IDC_SIDERELATIONS_TOGGLE; text = ICON_FRIENDLY; tooltip = CSTRING(FriendlyTo); - x = POS_W(17.55); + x = QUOTE(POS_W(17.55)); y = 0; - w = POS_W(1); - h = POS_H(1); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.7}; tooltipColorBox[] = {1, 1, 1, 1}; tooltipColorShade[] = {0, 0, 0, 0.65}; @@ -898,10 +898,10 @@ class GVAR(RscSideRelations): GVAR(RscDisplay) { }; class RelationSide_1: EGVAR(common,RscCombo) { idc = IDC_SIDERELATIONS_SIDE_1; - x = POS_W(10.1); + x = QUOTE(POS_W(10.1)); y = 0; - w = POS_W(7.35); - h = POS_H(1); + w = QUOTE(POS_W(7.35)); + h = QUOTE(POS_H(1)); class Items { class BLUFOR { text = "$STR_WEST"; @@ -922,16 +922,16 @@ class GVAR(RscSideRelations): GVAR(RscDisplay) { }; class RelationSide_2: RelationSide_1 { idc = IDC_SIDERELATIONS_SIDE_2; - x = POS_W(18.65); + x = QUOTE(POS_W(18.65)); class Items {}; // Special handling through script }; class RadioLabel: EGVAR(common,RscLabel) { text = CSTRING(PlayRadioMessage); - y = POS_H(1.1); + y = QUOTE(POS_H(1.1)); }; class Radio: GVAR(RscToolboxYesNo) { idc = IDC_SIDERELATIONS_RADIO; - y = POS_H(1.1); + y = QUOTE(POS_H(1.1)); }; }; }; @@ -946,7 +946,7 @@ class GVAR(RscSpawnReinforcements): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(27.4); + h = QUOTE(POS_H(27.4)); class controls { class SideLabel: EGVAR(common,RscLabel) { text = "$STR_eval_typeside"; @@ -957,74 +957,74 @@ class GVAR(RscSpawnReinforcements): GVAR(RscDisplay) { class VehicleSelect: RscControlsGroupNoScrollbars { idc = -1; x = 0; - y = POS_H(1.1); - w = POS_W(26); - h = POS_H(4.4); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(4.4)); class controls { class Title: EGVAR(common,RscLabel) { text = CSTRING(VehicleSelect); - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(3.4); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(3.4)); }; class FactionLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Faction); - x = POS_W(3); - y = POS_H(1.1); - w = POS_W(8.9); + x = QUOTE(POS_W(3)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(8.9)); colorBackground[] = {0, 0, 0, 0.7}; }; class FactionCombo: EGVAR(common,RscCombo) { idc = IDC_SPAWNREINFORCEMENTS_FACTION; - x = POS_W(12); - y = POS_H(1.1); - w = POS_W(11); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(11)); }; class CategoryLabel: FactionLabel { text = CSTRING(Category); - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); }; class CategoryCombo: FactionCombo { idc = IDC_SPAWNREINFORCEMENTS_CATEGORY; - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); }; class VehicleLabel: FactionLabel { text = ECSTRING(common,Vehicle); - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); }; class VehicleCombo: FactionCombo { idc = IDC_SPAWNREINFORCEMENTS_VEHICLE; - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); }; }; }; class GroupSelect: RscControlsGroupNoScrollbars { idc = -1; x = 0; - y = POS_H(5.5); - w = POS_W(26); - h = POS_H(14.2); + y = QUOTE(POS_H(5.5)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(14.2)); class controls { class Title: EGVAR(common,RscLabel) { text = CSTRING(GroupSelect); - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(13.2); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(13.2)); }; class TreeMode: ctrlToolbox { idc = IDC_SPAWNREINFORCEMENTS_TREE_MODE; - x = POS_W(0.1); - y = POS_H(1.1); - w = POS_W(13); - h = POS_H(1); + x = QUOTE(POS_W(0.1)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(13)); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,Premade), "$STR_Radio_Custom"}; @@ -1032,11 +1032,11 @@ class GVAR(RscSpawnReinforcements): GVAR(RscDisplay) { }; class TreeGroups: ctrlTree { idc = IDC_SPAWNREINFORCEMENTS_TREE_GROUPS; - x = POS_W(0.1); - y = POS_H(2.1) - pixelH; - w = POS_W(13); - h = POS_H(12); - sizeEx = 3.96 * (1 / (getResolution select 3)) * pixelGrid * 0.5; + x = QUOTE(POS_W(0.1)); + y = QUOTE(POS_H(2.1) - pixelH); + w = QUOTE(POS_W(13)); + h = QUOTE(POS_H(12)); + sizeEx = QUOTE(3.96 * (1 / (getResolution select 3)) * pixelGrid * 0.5); colorBackground[] = {0, 0, 0, 0.3}; colorBorder[] = {0, 0, 0, 0}; disableKeyboardSearch = 1; @@ -1046,41 +1046,41 @@ class GVAR(RscSpawnReinforcements): GVAR(RscDisplay) { }; class Label: EGVAR(common,RscLabel) { text = CSTRING(CurrentGroup); - x = POS_W(13.2); - y = POS_H(1.1); - w = POS_W(12.7); + x = QUOTE(POS_W(13.2)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(12.7)); colorBackground[] = {0, 0, 0, 0.7}; }; class UnitCount: Label { idc = IDC_SPAWNREINFORCEMENTS_UNIT_COUNT; style = ST_RIGHT; text = "0"; - w = POS_W(11.1); + w = QUOTE(POS_W(11.1)); colorBackground[] = {0, 0, 0, 0}; }; class UnitList: ctrlListbox { idc = IDC_SPAWNREINFORCEMENTS_UNIT_LIST; - x = POS_W(13.2); - y = POS_H(2.1) - pixelH; - w = POS_W(12.7); - h = POS_H(12); + x = QUOTE(POS_W(13.2)); + y = QUOTE(POS_H(2.1) - pixelH); + w = QUOTE(POS_W(12.7)); + h = QUOTE(POS_H(12)); colorBackground[] = {0, 0, 0, 0.3}; }; class UnitIcon: RscPicture { idc = -1; text = QPATHTOF(ui\person_ca.paa); - x = POS_W(24); - y = POS_H(1.1); - w = POS_W(1); - h = POS_H(1); + x = QUOTE(POS_W(24)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); }; class UnitClear: ctrlButtonPictureKeepAspect { idc = IDC_SPAWNREINFORCEMENTS_UNIT_CLEAR; text = "\a3\3den\data\cfg3den\history\deleteitems_ca.paa"; - x = POS_W(24.9); - y = POS_H(1.1); - w = POS_W(1); - h = POS_H(1); + x = QUOTE(POS_W(24.9)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0}; offsetPressedX = 0; offsetPressedY = 0; @@ -1090,43 +1090,43 @@ class GVAR(RscSpawnReinforcements): GVAR(RscDisplay) { class Properties: RscControlsGroupNoScrollbars { idc = -1; x = 0; - y = POS_H(19.7); - w = POS_W(26); - h = POS_H(7.7); + y = QUOTE(POS_H(19.7)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(7.7)); class controls { class Title: EGVAR(common,RscLabel) { text = "$STR_A3_RscDisplayLogin_Properties"; - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Background: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(6.7); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(6.7)); }; class VehicleLZLabel: EGVAR(common,RscLabel) { text = CSTRING(VehicleLZ); - x = POS_W(3); - y = POS_H(1.1); - w = POS_W(8.9); + x = QUOTE(POS_W(3)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(8.9)); colorBackground[] = {0, 0, 0, 0.7}; }; class VehicleLZ: EGVAR(common,RscCombo) { idc = IDC_SPAWNREINFORCEMENTS_VEHICLE_LZ; - x = POS_W(12); - y = POS_H(1.1); - w = POS_W(11); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(1.1)); + w = QUOTE(POS_W(11)); }; class VehicleBehaviourLabel: VehicleLZLabel { text = "Vehicle Behaviour"; - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); }; class VehicleBehaviour: ctrlToolbox { idc = IDC_SPAWNREINFORCEMENTS_VEHICLE_BEHAVIOUR; - x = POS_W(12); - y = POS_H(2.2); - w = POS_W(11); - h = POS_H(1); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(2.2)); + w = QUOTE(POS_W(11)); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {CSTRING(StayAtLZ), CSTRING(RTBAndDespawn)}; @@ -1134,39 +1134,39 @@ class GVAR(RscSpawnReinforcements): GVAR(RscDisplay) { }; class InsertionLabel: VehicleLZLabel { text = CSTRING(InsertionMethod); - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); }; class Insertion: VehicleLZ { idc = IDC_SPAWNREINFORCEMENTS_VEHICLE_INSERTION; - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); }; class FlyHeightLabel: VehicleLZLabel { text = CSTRING(ModuleFlyHeight); - y = POS_H(4.4); + y = QUOTE(POS_H(4.4)); }; class FlyHeight: EGVAR(common,RscEdit) { idc = IDC_SPAWNREINFORCEMENTS_VEHICLE_HEIGHT; - x = POS_W(12); - y = POS_H(4.4); - w = POS_W(11); - h = POS_H(1); + x = QUOTE(POS_W(12)); + y = QUOTE(POS_H(4.4)); + w = QUOTE(POS_W(11)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.3}; }; class UnitRPLabel: VehicleLZLabel { text = CSTRING(UnitRP); - y = POS_H(5.5); + y = QUOTE(POS_H(5.5)); }; class UnitRP: VehicleLZ { idc = IDC_SPAWNREINFORCEMENTS_UNIT_RP; - y = POS_H(5.5); + y = QUOTE(POS_H(5.5)); }; class UnitBehaviourLabel: VehicleLZLabel { text = CSTRING(UnitBehaviour); - y = POS_H(6.6); + y = QUOTE(POS_H(6.6)); }; class UnitBehaviour: VehicleBehaviour { idc = IDC_SPAWNREINFORCEMENTS_UNIT_BEHAVIOUR; - y = POS_H(6.6); + y = QUOTE(POS_H(6.6)); columns = 4; strings[] = { "$STR_Disp_Default", @@ -1191,94 +1191,94 @@ class GVAR(RscTracers): GVAR(RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(19.4); + h = QUOTE(POS_H(19.4)); class controls { class WeaponLabel: EGVAR(common,RscLabel) { text = ECSTRING(common,Weapon); - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class WeaponBackground: EGVAR(common,RscBackground) { x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(5); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(5)); }; class Weapon: ctrlListNBox { idc = IDC_TRACERS_WEAPON; x = 0; - y = POS_H(1); - w = POS_W(26); - h = POS_H(5); - rowHeight = POS_H(1.2); + y = QUOTE(POS_H(1)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(5)); + rowHeight = QUOTE(POS_H(1.2)); columns[] = {0.05, 0.15, 0.9}; tooltipPerColumn = 0; }; class MagazineLabel: WeaponLabel { text = ECSTRING(common,Magazine); - y = POS_H(6.1); + y = QUOTE(POS_H(6.1)); }; class MagazineBackground: WeaponBackground { - y = POS_H(7.1); + y = QUOTE(POS_H(7.1)); }; class Magazine: Weapon { idc = IDC_TRACERS_MAGAZINE; - y = POS_H(7.1); + y = QUOTE(POS_H(7.1)); }; class DelayLabel: WeaponLabel { text = CSTRING(Tracers_BurstDelay); tooltip = CSTRING(Tracers_BurstDelay_Tooltip); - y = POS_H(12.2); + y = QUOTE(POS_H(12.2)); }; class DelayBackground: WeaponBackground { - y = POS_H(13.2); - h = POS_H(2); + y = QUOTE(POS_H(13.2)); + h = QUOTE(POS_H(2)); }; class DelayMinLabel: RscText { style = ST_RIGHT; text = "$STR_3DEN_Attributes_Timeout_TitleMin_text"; font = "RobotoCondensedLight"; - x = POS_W(4); - y = POS_H(13.7); - w = POS_W(2); - h = POS_H(1); + x = QUOTE(POS_W(4)); + y = QUOTE(POS_H(13.7)); + w = QUOTE(POS_W(2)); + h = QUOTE(POS_H(1)); shadow = 0; }; class DelayMin: EGVAR(common,RscEdit) { idc = IDC_TRACERS_DELAY_MIN; font = "EtelkaMonospacePro"; - x = POS_W(6); - y = POS_H(13.7); - w = POS_W(4); - h = POS_H(1); - sizeEx = POS_H(0.8); + x = QUOTE(POS_W(6)); + y = QUOTE(POS_H(13.7)); + w = QUOTE(POS_W(4)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(0.8)); }; class DelayMidLabel: DelayMinLabel { text = "$STR_3DEN_Attributes_Timeout_TitleMid_text"; - x = POS_W(10); + x = QUOTE(POS_W(10)); }; class DelayMid: DelayMin { idc = IDC_TRACERS_DELAY_MID; - x = POS_W(12); + x = QUOTE(POS_W(12)); }; class DelayMaxLabel: DelayMinLabel { text = "$STR_3DEN_Attributes_Timeout_TitleMax_text"; - x = POS_W(16); + x = QUOTE(POS_W(16)); }; class DelayMax: DelayMin { idc = IDC_TRACERS_DELAY_MAX; - x = POS_W(18); + x = QUOTE(POS_W(18)); }; class DispersionLabel: WeaponLabel { text = CSTRING(Tracers_Dispersion); tooltip = CSTRING(Tracers_Dispersion_Tooltip); - y = POS_H(15.3); + y = QUOTE(POS_H(15.3)); }; class Dispersion: ctrlToolbox { idc = IDC_TRACERS_DISPERSION; x = 0; - y = POS_H(16.3); - w = POS_W(26); - h = POS_H(1); + y = QUOTE(POS_H(16.3)); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); rows = 1; columns = 5; strings[] = { @@ -1291,11 +1291,11 @@ class GVAR(RscTracers): GVAR(RscDisplay) { }; class TargetLabel: WeaponLabel { text = "$STR_A3_CfgVehicles_ModuleAI_F_Arguments_Target_0"; - y = POS_H(17.4); + y = QUOTE(POS_H(17.4)); }; class Target: Dispersion { idc = IDC_TRACERS_TARGET; - y = POS_H(18.4); + y = QUOTE(POS_H(18.4)); columns = 3; strings[] = { "$STR_A3_RscDisplayArsenal_ButtonRandom", @@ -1310,10 +1310,10 @@ class GVAR(RscTracers): GVAR(RscDisplay) { }; class Change: ctrlCheckbox { idc = IDC_TRACERS_CHANGE; - x = POS_W(25); - y = POS_H(17.4); - w = POS_W(1); - h = POS_H(1); + x = QUOTE(POS_W(25)); + y = QUOTE(POS_H(17.4)); + w = QUOTE(POS_W(1)); + h = QUOTE(POS_H(1)); }; }; }; diff --git a/addons/placement/XEH_preInit.sqf b/addons/placement/XEH_preInit.sqf index 7adf3a3dc..5fefb17da 100644 --- a/addons/placement/XEH_preInit.sqf +++ b/addons/placement/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" GVAR(helper) = objNull; GVAR(object) = objNull; diff --git a/addons/placement/initSettings.sqf b/addons/placement/initSettings.inc.sqf similarity index 100% rename from addons/placement/initSettings.sqf rename to addons/placement/initSettings.inc.sqf diff --git a/addons/pylons/gui.hpp b/addons/pylons/gui.hpp index 3ccfe1a1b..d59472d3a 100644 --- a/addons/pylons/gui.hpp +++ b/addons/pylons/gui.hpp @@ -15,69 +15,69 @@ class GVAR(display) { class controls { class Title: RscText { idc = IDC_TITLE; - x = CENTER_X - (PICTURE_W + GRID_W(5)) / 2; - y = CENTER_Y - (PICTURE_H + GRID_H(22)) / 2; - w = PICTURE_W + GRID_W(5); - h = GRID_H(5); + x = QUOTE(CENTER_X - (PICTURE_W + GRID_W(5)) / 2); + y = QUOTE(CENTER_Y - (PICTURE_H + GRID_H(22)) / 2); + w = QUOTE(PICTURE_W + GRID_W(5)); + h = QUOTE(GRID_H(5)); colorBackground[] = GUI_THEME_COLOR; moving = 1; }; class Background: RscText { idc = -1; - x = CENTER_X - (PICTURE_W + GRID_W(5)) / 2; - y = CENTER_Y - (PICTURE_H + GRID_H(11)) / 2; - w = PICTURE_W + GRID_W(5); - h = PICTURE_H + GRID_H(11); + x = QUOTE(CENTER_X - (PICTURE_W + GRID_W(5)) / 2); + y = QUOTE(CENTER_Y - (PICTURE_H + GRID_H(11)) / 2); + w = QUOTE(PICTURE_W + GRID_W(5)); + h = QUOTE(PICTURE_H + GRID_H(11)); colorBackground[] = {0, 0, 0, 0.7}; }; class PictureBackground: ctrlStaticBackground { idc = -1; - x = CENTER_X - PICTURE_W / 2; - y = CENTER_Y - (PICTURE_H + GRID_H(6)) / 2; - w = PICTURE_W; - h = PICTURE_H; + x = QUOTE(CENTER_X - PICTURE_W / 2); + y = QUOTE(CENTER_Y - (PICTURE_H + GRID_H(6)) / 2); + w = QUOTE(PICTURE_W); + h = QUOTE(PICTURE_H); }; class Picture: ctrlStaticPictureKeepAspect { idc = IDC_PICTURE; - x = CENTER_X - PICTURE_W / 2; - y = CENTER_Y - (PICTURE_H + GRID_H(6)) / 2; - w = PICTURE_W; - h = PICTURE_H; + x = QUOTE(CENTER_X - PICTURE_W / 2); + y = QUOTE(CENTER_Y - (PICTURE_H + GRID_H(6)) / 2); + w = QUOTE(PICTURE_W); + h = QUOTE(PICTURE_H); }; class Presets: ctrlCombo { idc = IDC_PRESETS; - x = CENTER_X - PICTURE_W / 2; - y = CENTER_Y + (PICTURE_H + GRID_H(6)) / 2 - GRID_H(5); - w = PICTURE_W / 3; - h = GRID_H(5); + x = QUOTE(CENTER_X - PICTURE_W / 2); + y = QUOTE(CENTER_Y + (PICTURE_H + GRID_H(6)) / 2 - GRID_H(5)); + w = QUOTE(PICTURE_W / 3); + h = QUOTE(GRID_H(5)); }; class MirrorLabel: ctrlStatic { style = ST_RIGHT; text = "$STR_3DEN_Object_Attribute_PylonsMirror_displayName"; tooltip = "$STR_3DEN_Object_Attribute_PylonsMirror_tooltip"; - x = CENTER_X + PICTURE_W / 2 - GRID_W(35); - y = CENTER_Y + (PICTURE_H + GRID_H(6)) / 2 - GRID_H(5); - w = GRID_W(30); - h = GRID_H(5); + x = QUOTE(CENTER_X + PICTURE_W / 2 - GRID_W(35)); + y = QUOTE(CENTER_Y + (PICTURE_H + GRID_H(6)) / 2 - GRID_H(5)); + w = QUOTE(GRID_W(30)); + h = QUOTE(GRID_H(5)); }; class Mirror: ctrlCheckbox { idc = IDC_MIRROR; - x = CENTER_X + PICTURE_W / 2 - GRID_W(5); - y = CENTER_Y + (PICTURE_H + GRID_H(6)) / 2 - GRID_H(5); - w = GRID_W(5); - h = GRID_H(5); + x = QUOTE(CENTER_X + PICTURE_W / 2 - GRID_W(5)); + y = QUOTE(CENTER_Y + (PICTURE_H + GRID_H(6)) / 2 - GRID_H(5)); + w = QUOTE(GRID_W(5)); + h = QUOTE(GRID_H(5)); }; class ButtonOK: RscButtonMenuOK { - x = CENTER_X + (PICTURE_W + GRID_W(5)) / 2 - GRID_W(25); - y = CENTER_Y + (PICTURE_H + GRID_H(22)) / 2 - GRID_H(5); - w = GRID_W(25); - h = GRID_H(5); + x = QUOTE(CENTER_X + (PICTURE_W + GRID_W(5)) / 2 - GRID_W(25)); + y = QUOTE(CENTER_Y + (PICTURE_H + GRID_H(22)) / 2 - GRID_H(5)); + w = QUOTE(GRID_W(25)); + h = QUOTE(GRID_H(5)); }; class ButtonCancel: RscButtonMenuCancel { - x = CENTER_X - (PICTURE_W + GRID_W(5)) / 2; - y = CENTER_Y + (PICTURE_H + GRID_H(22)) / 2 - GRID_H(5); - w = GRID_W(25); - h = GRID_H(5); + x = QUOTE(CENTER_X - (PICTURE_W + GRID_W(5)) / 2); + y = QUOTE(CENTER_Y + (PICTURE_H + GRID_H(22)) / 2 - GRID_H(5)); + w = QUOTE(GRID_W(25)); + h = QUOTE(GRID_H(5)); }; }; }; diff --git a/addons/remote_control/XEH_preInit.sqf b/addons/remote_control/XEH_preInit.sqf index 9361d0501..894773534 100644 --- a/addons/remote_control/XEH_preInit.sqf +++ b/addons/remote_control/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/remote_control/initSettings.sqf b/addons/remote_control/initSettings.inc.sqf similarity index 100% rename from addons/remote_control/initSettings.sqf rename to addons/remote_control/initSettings.inc.sqf diff --git a/addons/tasks/gui.hpp b/addons/tasks/gui.hpp index bedcea473..8dc8415f3 100644 --- a/addons/tasks/gui.hpp +++ b/addons/tasks/gui.hpp @@ -27,27 +27,27 @@ class GVAR(RscTasks): EGVAR(modules,RscDisplay) { class Title: Title {}; class Background: Background {}; class Content: Content { - h = POS_H(24.8); + h = QUOTE(POS_H(24.8)); class controls { class OwnersLabel: EGVAR(common,RscLabel) { text = "$STR_A3_RscAttributeOwners_Title"; - w = POS_W(26); + w = QUOTE(POS_W(26)); }; class Owners: EGVAR(common,RscOwners) { idc = IDC_TASK_OWNERS; - y = POS_H(1); + y = QUOTE(POS_H(1)); }; class StateLabel: EGVAR(common,RscLabel) { text = "$STR_A3_RscAttributeTaskState_Title"; - y = POS_H(11.1); - h = POS_H(2); + y = QUOTE(POS_H(11.1)); + h = QUOTE(POS_H(2)); }; class State: ctrlToolboxPictureKeepAspect { idc = IDC_TASK_STATE; - x = POS_W(10.1); - y = POS_H(11.1); - w = POS_W(15.9); - h = POS_H(2); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(11.1)); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(2)); rows = 1; columns = 5; strings[] = { @@ -67,14 +67,14 @@ class GVAR(RscTasks): EGVAR(modules,RscDisplay) { }; class DestinationLabel: EGVAR(common,RscLabel) { text = "$STR_A3_CfgVehicles_ModuleTaskSetDestination_F_Arguments_Destination_0"; - y = POS_H(13.2); + y = QUOTE(POS_H(13.2)); }; class Destination: ctrlToolbox { idc = IDC_TASK_DESTINATION; - x = POS_W(10.1); - y = POS_H(13.2); - w = POS_W(15.9); - h = POS_H(1); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(13.2)); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,Disabled), CSTRING(ModulePosition)}; @@ -83,38 +83,38 @@ class GVAR(RscTasks): EGVAR(modules,RscDisplay) { class TypeLabel: EGVAR(common,RscLabel) { text = "$STR_A3_cfgvehicles_moduletaskcreate_f_arguments_type_0"; tooltip = CSTRING(Type_Tooltip); - y = POS_H(14.3); + y = QUOTE(POS_H(14.3)); }; class Type: ctrlCombo { idc = IDC_TASK_TYPE; - x = POS_W(10.1); - y = POS_H(14.3); - w = POS_W(15.9); - h = POS_H(1); + x = QUOTE(POS_W(10.1)); + y = QUOTE(POS_H(14.3)); + w = QUOTE(POS_W(15.9)); + h = QUOTE(POS_H(1)); }; class TitleDescriptionLabel: EGVAR(common,RscLabel) { text = CSTRING(TitleDescription); tooltip = CSTRING(TitleDescription_Tooltip); - y = POS_H(15.4); + y = QUOTE(POS_H(15.4)); }; class History: Type { idc = IDC_TASK_HISTORY; - y = POS_H(15.4); + y = QUOTE(POS_H(15.4)); }; class Title: EGVAR(common,RscEdit) { idc = IDC_TASK_TITLE; - x = pixelW; - y = POS_H(16.5); - w = POS_W(26) - pixelW; + x = QUOTE(pixelW); + y = QUOTE(POS_H(16.5)); + w = QUOTE(POS_W(26) - pixelW); }; class Description: EGVAR(common,RscEdit) { idc = IDC_TASK_DESCRIPTION; style = ST_MULTI; - x = pixelW; - y = POS_H(17.6); - w = POS_W(26) - pixelW; - h = POS_H(7.2); - sizeEx = POS_H(0.9); + x = QUOTE(pixelW); + y = QUOTE(POS_H(17.6)); + w = QUOTE(POS_W(26) - pixelW); + h = QUOTE(POS_H(7.2)); + sizeEx = QUOTE(POS_H(0.9)); }; }; }; diff --git a/addons/visibility/XEH_preInit.sqf b/addons/visibility/XEH_preInit.sqf index 9361d0501..894773534 100644 --- a/addons/visibility/XEH_preInit.sqf +++ b/addons/visibility/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/visibility/initSettings.sqf b/addons/visibility/initSettings.inc.sqf similarity index 100% rename from addons/visibility/initSettings.sqf rename to addons/visibility/initSettings.inc.sqf diff --git a/addons/vision/RscTitles.hpp b/addons/vision/RscTitles.hpp index 54373bcad..ee1a0987b 100644 --- a/addons/vision/RscTitles.hpp +++ b/addons/vision/RscTitles.hpp @@ -11,10 +11,10 @@ class RscTitles { idc = IDC_MODE_0; style = ST_CENTER; x = 0; - y = safeZoneY + POS_H(3.3); - w = WIDTH_SINGLE; - h = POS_H(0.9); - sizeEx = POS_H(0.8); + y = QUOTE(safeZoneY + POS_H(3.3)); + w = QUOTE(WIDTH_SINGLE); + h = QUOTE(POS_H(0.9)); + sizeEx = QUOTE(POS_H(0.8)); shadow = 0; }; class Mode_1: Mode_0 { diff --git a/addons/vision/XEH_preInit.sqf b/addons/vision/XEH_preInit.sqf index 39a7cec02..e3c1169aa 100644 --- a/addons/vision/XEH_preInit.sqf +++ b/addons/vision/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" -#include "initKeybinds.sqf" +#include "initSettings.inc.sqf" +#include "initKeybinds.inc.sqf" ADDON = true; diff --git a/addons/vision/functions/fnc_showHint.sqf b/addons/vision/functions/fnc_showHint.sqf index 51e64f92f..2a5bf64be 100644 --- a/addons/vision/functions/fnc_showHint.sqf +++ b/addons/vision/functions/fnc_showHint.sqf @@ -31,7 +31,7 @@ private _modesCount = count _modes; private _posX = 0.5 - WIDTH_SINGLE * _modesCount / 2; // No grow effect if only one vision mode available -private _commitTime = if (_modesCount > 1) then {0.2} else {0}; +private _commitTime = [0, 0.2] select (_modesCount > 1); { // Get name and color for vision mode diff --git a/addons/vision/initKeybinds.sqf b/addons/vision/initKeybinds.inc.sqf similarity index 100% rename from addons/vision/initKeybinds.sqf rename to addons/vision/initKeybinds.inc.sqf diff --git a/addons/vision/initSettings.sqf b/addons/vision/initSettings.inc.sqf similarity index 100% rename from addons/vision/initSettings.sqf rename to addons/vision/initSettings.inc.sqf diff --git a/hemtt.toml b/hemtt.toml deleted file mode 100644 index c20fdf455..000000000 --- a/hemtt.toml +++ /dev/null @@ -1,26 +0,0 @@ -name = "Zeus Enhanced" -prefix = "zen" -author = "ZEN Team" -mainprefix = "x" -files = [ - "mod.cpp", - "logo_zen_ca.paa", - "logo_zen_small_ca.paa", - "LICENSE", - "AUTHORS.txt", - "README.md", - "meta.cpp" -] -include = ["./include"] - -key_name = "{{prefix}}_{{version}}" -authority = "{{prefix}}_{{version}}-{{git \"id 8\"}}" - -optionals = ["compat_ace"] - -releasebuild = [ - "@zip @zen_{{version}}" -] - -[header_exts] -version = "{{git \"id 8\"}}" diff --git a/include/a3/3den/ui/resincl.inc b/include/a3/3den/ui/resincl.inc new file mode 100644 index 000000000..ae1d973af --- /dev/null +++ b/include/a3/3den/ui/resincl.inc @@ -0,0 +1,525 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/// Control types and styles +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Control types +#define CT_STATIC 0 +#define CT_BUTTON 1 +#define CT_EDIT 2 +#define CT_SLIDER 3 +#define CT_COMBO 4 +#define CT_LISTBOX 5 +#define CT_TOOLBOX 6 +#define CT_CHECKBOXES 7 +#define CT_PROGRESS 8 +#define CT_HTML 9 +#define CT_STATIC_SKEW 10 +#define CT_ACTIVETEXT 11 +#define CT_TREE 12 +#define CT_STRUCTURED_TEXT 13 +#define CT_CONTEXT_MENU 14 +#define CT_CONTROLS_GROUP 15 +#define CT_SHORTCUTBUTTON 16 +#define CT_HITZONES 17 +#define CT_XKEYDESC 40 +#define CT_XBUTTON 41 +#define CT_XLISTBOX 42 +#define CT_XSLIDER 43 +#define CT_XCOMBO 44 +#define CT_ANIMATED_TEXTURE 45 +#define CT_MENU 46 +#define CT_MENU_STRIP 47 +#define CT_OBJECT 80 +#define CT_OBJECT_ZOOM 81 +#define CT_OBJECT_CONTAINER 82 +#define CT_OBJECT_CONT_ANIM 83 +#define CT_LINEBREAK 98 +#define CT_USER 99 +#define CT_MAP 100 +#define CT_MAP_MAIN 101 +#define CT_LISTNBOX 102 +#define CT_ITEMSLOT 103 +#define CT_CHECKBOX 77 + +// Static styles +#define ST_POS 0x0F +#define ST_HPOS 0x03 +#define ST_VPOS 0x0C +#define ST_LEFT 0x00 +#define ST_RIGHT 0x01 +#define ST_CENTER 0x02 +#define ST_DOWN 0x04 +#define ST_UP 0x08 +#define ST_VCENTER 0x0C + +#define ST_TYPE 0xF0 +#define ST_SINGLE 0x00 +#define ST_MULTI 0x10 +#define ST_TITLE_BAR 0x20 +#define ST_PICTURE 0x30 +#define ST_FRAME 0x40 +#define ST_BACKGROUND 0x50 +#define ST_GROUP_BOX 0x60 +#define ST_GROUP_BOX2 0x70 +#define ST_HUD_BACKGROUND 0x80 +#define ST_TILE_PICTURE 0x90 +#define ST_WITH_RECT 0xA0 +#define ST_LINE 0xB0 +#define ST_UPPERCASE 0xC0 +#define ST_LOWERCASE 0xD0 + +#define ST_SHADOW 0x100 +#define ST_NO_RECT 0x200 +#define ST_KEEP_ASPECT_RATIO 0x800 + +#define ST_TITLE ST_TITLE_BAR + ST_CENTER + +// Slider styles +#define SL_DIR 0x400 +#define SL_VERT 0 +#define SL_HORZ 0x400 + +#define SL_TEXTURES 0x10 + +// progress bar +#define ST_VERTICAL 0x01 +#define ST_HORIZONTAL 0 + +// Listbox styles +#define LB_TEXTURES 0x10 +#define LB_MULTI 0x20 + +// Tree styles +#define TR_SHOWROOT 1 +#define TR_AUTOCOLLAPSE 2 + +// MessageBox styles +#define MB_BUTTON_OK 1 +#define MB_BUTTON_CANCEL 2 +#define MB_BUTTON_USER 4 +#define MB_ERROR_DIALOG 8 + +// Xbox buttons +#define KEY_XINPUT 0x00050000 + +#define KEY_XBOX_A KEY_XINPUT + 0 +#define KEY_XBOX_B KEY_XINPUT + 1 +#define KEY_XBOX_X KEY_XINPUT + 2 +#define KEY_XBOX_Y KEY_XINPUT + 3 +#define KEY_XBOX_Up KEY_XINPUT + 4 +#define KEY_XBOX_Down KEY_XINPUT + 5 +#define KEY_XBOX_Left KEY_XINPUT + 6 +#define KEY_XBOX_Right KEY_XINPUT + 7 +#define KEY_XBOX_Start KEY_XINPUT + 8 +#define KEY_XBOX_Back KEY_XINPUT + 9 +#define KEY_XBOX_LeftBumper KEY_XINPUT + 10 +#define KEY_XBOX_RightBumper KEY_XINPUT + 11 +#define KEY_XBOX_LeftTrigger KEY_XINPUT + 12 +#define KEY_XBOX_RightTrigger KEY_XINPUT + 13 +#define KEY_XBOX_LeftThumb KEY_XINPUT + 14 +#define KEY_XBOX_RightThumb KEY_XINPUT + 15 +#define KEY_XBOX_LeftThumbXRight KEY_XINPUT + 16 +#define KEY_XBOX_LeftThumbYUp KEY_XINPUT + 17 +#define KEY_XBOX_RightThumbXRight KEY_XINPUT + 18 +#define KEY_XBOX_RightThumbYUp KEY_XINPUT + 19 +#define KEY_XBOX_LeftThumbXLeft KEY_XINPUT + 20 +#define KEY_XBOX_LeftThumbYDown KEY_XINPUT + 21 +#define KEY_XBOX_RightThumbXLeft KEY_XINPUT + 22 +#define KEY_XBOX_RightThumbYDown KEY_XINPUT + 23 + +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/// Display IDDs and IDCs +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Predefined controls +#define IDC_OK 1 +#define IDC_CANCEL 2 +#define IDC_AUTOCANCEL 3 +#define IDC_ABORT 4 +#define IDC_RESTART 5 +#define IDC_USER_BUTTON 6 + +// display3DENMsgBox +#define IDC_MSG_BOX_MESSAGE 101 +#define IDC_DISPLAY3DENMSGBOX_TITLE 102 +#define IDC_DISPLAY3DENMSGBOX_BACKGROUND 103 +#define IDC_DISPLAY3DENMSGBOX_PICTURE 104 +#define IDC_DISPLAY3DENMSGBOX_BOTTOMBACKGROUND 105 + +// display3DEN +#define IDD_DISPLAY3DEN 313 + +#define IDC_DISPLAY3DEN_SCROLLBLOCK_TOP 46 +#define IDC_DISPLAY3DEN_SCROLLBLOCK_LEFT 47 +#define IDC_DISPLAY3DEN_SCROLLBLOCK_RIGHT 48 +#define IDC_DISPLAY3DEN_SCROLLBLOCK_BOTTOM 49 +#define IDC_DISPLAY3DEN_MAP 51 +#define IDC_DISPLAY3DEN_MOUSEAREA 52 +#define IDC_DISPLAY3DEN_MODES 53 +#define IDC_DISPLAY3DEN_SUBMODES 54 +#define IDC_DISPLAY3DEN_EDIT 55 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_WEST 56 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_EAST 57 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_GUER 58 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_CIV 59 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_EMPTY 60 +#define IDC_DISPLAY3DEN_CREATE_GROUP_WEST 61 +#define IDC_DISPLAY3DEN_CREATE_GROUP_EAST 62 +#define IDC_DISPLAY3DEN_CREATE_GROUP_GUER 63 +#define IDC_DISPLAY3DEN_CREATE_GROUP_CIV 64 +#define IDC_DISPLAY3DEN_CREATE_GROUP_EMPTY 65 +#define IDC_DISPLAY3DEN_CREATE_GROUP_CUSTOM 71 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_LOGIC 66 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_MODULE 67 +#define IDC_DISPLAY3DEN_CREATE_TRIGGER 68 +#define IDC_DISPLAY3DEN_CREATE_WAYPOINT 6900000 +#define IDC_DISPLAY3DEN_CREATE_MARKER_ICON 69 +#define IDC_DISPLAY3DEN_CREATE_MARKER_SHAPE 70 +#define IDC_DISPLAY3DEN_CREATE_ALL\ + IDC_DISPLAY3DEN_CREATE_OBJECT_WEST,\ + IDC_DISPLAY3DEN_CREATE_OBJECT_EAST,\ + IDC_DISPLAY3DEN_CREATE_OBJECT_GUER,\ + IDC_DISPLAY3DEN_CREATE_OBJECT_CIV,\ + IDC_DISPLAY3DEN_CREATE_OBJECT_EMPTY,\ + IDC_DISPLAY3DEN_CREATE_GROUP_WEST,\ + IDC_DISPLAY3DEN_CREATE_GROUP_EAST,\ + IDC_DISPLAY3DEN_CREATE_GROUP_GUER,\ + IDC_DISPLAY3DEN_CREATE_GROUP_CIV,\ + IDC_DISPLAY3DEN_CREATE_GROUP_EMPTY,\ + IDC_DISPLAY3DEN_CREATE_GROUP_CUSTOM,\ + IDC_DISPLAY3DEN_CREATE_FAVORITE,\ + IDC_DISPLAY3DEN_CREATE_OBJECT_LOGIC,\ + IDC_DISPLAY3DEN_CREATE_OBJECT_MODULE,\ + IDC_DISPLAY3DEN_CREATE_TRIGGER,\ + IDC_DISPLAY3DEN_CREATE_WAYPOINT,\ + IDC_DISPLAY3DEN_CREATE_MARKER_ICON,\ + IDC_DISPLAY3DEN_CREATE_MARKER_SHAPE + +#define IDC_DISPLAY3DEN_HISTORY 74 +#define IDC_DISPLAY3DEN_LOCATIONS 75 +#define IDC_DISPLAY3DEN_MISSIONNAME 76 +#define IDC_DISPLAY3DEN_SEARCH 800 +#define IDC_DISPLAY3DEN_SEARCH_BUTTON 810 +#define IDC_DISPLAY3DEN_SEARCH_TREE 820 +#define IDC_DISPLAY3DEN_SEARCHEDIT 80 +#define IDC_DISPLAY3DEN_SEARCHEDIT_BUTTON 81 +#define IDC_DISPLAY3DEN_SEARCHCREATE 82 +#define IDC_DISPLAY3DEN_SEARCHCREATE_BUTTON 83 +#define IDC_DISPLAY3DEN_EDIT_LAYER 84 +#define IDC_DISPLAY3DEN_EDIT_DELETE 85 +#define IDC_DISPLAY3DEN_EDIT_LAYER_REMOVE 86 +#define IDC_DISPLAY3DEN_NAVIGATION_WIDGET 87 +#define IDC_DISPLAY3DEN_EDIT_COLLAPSE_ALL 88 +#define IDC_DISPLAY3DEN_EDIT_EXPAND_ALL 89 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_ADD 90 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_EDIT 91 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_DELETE 92 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_PUBLISH 93 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_GROUP 94 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_NAME 95 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_AUTHOR 96 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_CATEGORY 97 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_LIST 103 +#define IDC_DISPLAY3DEN_EDITORPREVIEW_GROUP 98 +#define IDC_DISPLAY3DEN_EDITORPREVIEW 99 + +#define IDC_DISPLAY3DEN_MENUSTRIP 120 //--- ToDo: Reindex + +#define IDC_DISPLAY3DEN_WATERMARK 999 +#define IDC_DISPLAY3DEN_BLACK 998 + +#define IDC_DISPLAY3DEN_TOOLBAR 1000 +#define IDC_DISPLAY3DEN_TOOLBAR_BACKGROUND 1001 +#define IDC_DISPLAY3DEN_TOOLBAR_FILE 1002 +#define IDC_DISPLAY3DEN_TOOLBAR_HISTORY 1003 +#define IDC_DISPLAY3DEN_TOOLBAR_WIDGET 1004 +#define IDC_DISPLAY3DEN_WIDGET_NONE 10041 +#define IDC_DISPLAY3DEN_WIDGET_TRANSLATION 10042 +#define IDC_DISPLAY3DEN_WIDGET_ROTATION 10043 +#define IDC_DISPLAY3DEN_WIDGET_SCALING 10044 +#define IDC_DISPLAY3DEN_WIDGET_AREA 10045 +#define IDC_DISPLAY3DEN_TOOLBAR_INTERACTION 1005 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID 1024 +#define IDC_DISPLAY3DEN_TOOLBAR_HELP 10251 +#define IDC_DISPLAY3DEN_TOOLBAR_NEW 1006 +#define IDC_DISPLAY3DEN_TOOLBAR_OPEN 1007 +#define IDC_DISPLAY3DEN_TOOLBAR_SAVE 1008 +#define IDC_DISPLAY3DEN_TOOLBAR_SAVEAS 1009 +#define IDC_DISPLAY3DEN_TOOLBAR_PUBLISH 10091 +#define IDC_DISPLAY3DEN_TOOLBAR_UNDO 1010 +#define IDC_DISPLAY3DEN_TOOLBAR_REDO 1011 +#define IDC_DISPLAY3DEN_TOOLBAR_WNONE 1012 +#define IDC_DISPLAY3DEN_TOOLBAR_WTRANSLATION 1013 +#define IDC_DISPLAY3DEN_TOOLBAR_WROTATION 1014 +#define IDC_DISPLAY3DEN_TOOLBAR_WSCALING 1015 +#define IDC_DISPLAY3DEN_TOOLBAR_COORD 1016 +#define IDC_DISPLAY3DEN_TOOLBAR_VERT 1017 +#define IDC_DISPLAY3DEN_TOOLBAR_SRFSNAP 1018 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID_TRANSLATION 1025 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID_TRANSLATION_VALUE 1026 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID_ROTATION 1027 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID_ROTATION_VALUE 1028 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID_SCALING 1029 +#define IDC_DISPLAY3DEN_TOOLBAR_GRID_SCALING_VALUE 1030 +#define IDC_DISPLAY3DEN_TOOLBAR_MISSION 10301 +#define IDC_DISPLAY3DEN_TOOLBAR_MISSION_INTEL 10302 +#define IDC_DISPLAY3DEN_TOOLBAR_MISSION_MAP 10303 +#define IDC_DISPLAY3DEN_TOOLBAR_MISSION_VISION 10304 +#define IDC_DISPLAY3DEN_TOOLBAR_MISSION_FLASHLIGHT 10305 +#define IDC_DISPLAY3DEN_TOOLBAR_HELP_TUTORIAL 10310 +#define IDC_DISPLAY3DEN_TOOLBAR_HELP_UPDATES 10311 +#define IDC_DISPLAY3DEN_TOOLBAR_WORKSPACE 10306 +#define IDC_DISPLAY3DEN_NOTIFICATION 10312 +#define IDC_DISPLAY3DEN_MENU 1100 + +#define IDC_DISPLAY3DEN_PANELLEFT 1019 +#define IDC_DISPLAY3DEN_PANELLEFT_BACKGROUND 1020 +#define IDC_DISPLAY3DEN_PANELRIGHT 1021 +#define IDC_DISPLAY3DEN_PANELRIGHT_BACKGROUND 1022 +#define IDC_DISPLAY3DEN_PLAY 1023 +#define IDC_DISPLAY3DEN_TABLEFT_TOGGLE 1031 +#define IDC_DISPLAY3DEN_TABLEFT_TOGGLE_PANEL 1032 +#define IDC_DISPLAY3DEN_TABLEFT_SECTIONS 1033 +#define IDC_DISPLAY3DEN_TABRIGHT_TOGGLE 1034 +#define IDC_DISPLAY3DEN_TABRIGHT_TOGGLE_PANEL 1035 +#define IDC_DISPLAY3DEN_TABRIGHT_SECTIONS 1036 +#define IDC_DISPLAY3DEN_PANELLEFT_EDIT 1037 +#define IDC_DISPLAY3DEN_PANELLEFT_LOCATIONS 1038 +#define IDC_DISPLAY3DEN_PANELRIGHT_CREATE 1039 +#define IDC_DISPLAY3DEN_PANELRIGHT_HISTORY 1040 +#define IDC_DISPLAY3DEN_SEARCHLOCATIONS 1042 +#define IDC_DISPLAY3DEN_SEARCHLOCATIONS_BUTTON 1043 +#define IDC_DISPLAY3DEN_CONTROLSHINT 1044 +#define IDC_DISPLAY3DEN_CREATE_OBJECT_EMPTY_WARNING 1045 +#define IDC_DISPLAY3DEN_LOCATIONS_LAYER 1046 +#define IDC_DISPLAY3DEN_LOCATIONS_LOCATION 1047 +#define IDC_DISPLAY3DEN_LOCATIONS_DELETE 1048 +#define IDC_DISPLAY3DEN_CREATE 1049 +#define IDC_DISPLAY3DEN_MODELABELS 1060 +#define IDC_DISPLAY3DEN_CUSTOMCOMPOSITION_CONTROLPANEL 1061 +#define IDC_DISPLAY3DEN_VEHICLE_CONTROLPANEL 1062 +#define IDC_DISPLAY3DEN_VEHICLE_TOGGLE 1063 +#define IDC_DISPLAY3DEN_EDIT_LAYER_SHOW 1064 +#define IDC_DISPLAY3DEN_EDIT_LAYER_ENABLE 1065 + +#define IDC_DISPLAY3DEN_STATUSBAR 1050 +#define IDC_DISPLAY3DEN_STATUSBAR_BACKGROUND 1051 +#define IDC_DISPLAY3DEN_STATUSBAR_X 1052 +#define IDC_DISPLAY3DEN_STATUSBAR_Y 1053 +#define IDC_DISPLAY3DEN_STATUSBAR_Z 1054 +#define IDC_DISPLAY3DEN_STATUSBAR_DIS 1055 +#define IDC_DISPLAY3DEN_STATUSBAR_FPS 1056 +#define IDC_DISPLAY3DEN_STATUSBAR_VERSION 1057 +#define IDC_DISPLAY3DEN_STATUSBAR_MOD 1058 +#define IDC_DISPLAY3DEN_STATUSBAR_SERVER 1059 + +// display3DENPlace +#define IDD_DISPLAY3DENPLACE 321 + +// display3DENSave +#define IDD_DISPLAY3DENSAVE 314 +#define IDD_OVERRIDE_CHANGES_MSG 330 +#define IDD_DISPLAY3DENSAVE_DELETEFOLDER_BOX 331 +#define IDC_DISPLAY3DENSAVE_FOLDERS 101 +#define IDC_DISPLAY3DENSAVE_NAME 102 +#define IDC_DISPLAY3DENSAVE_FILES 103 +#define IDC_DISPLAY3DENSAVE_TITLE 104 +#define IDC_DISPLAY3DENSAVE_SEARCH 105 +#define IDC_DISPLAY3DENSAVE_SEARCHBUTTON 106 +#define IDC_DISPLAY3DENSAVE_FILTER 107 +#define IDC_DISPLAY3DENSAVE_BINARIZETEXT 108 +#define IDC_DISPLAY3DENSAVE_BINARIZE 109 +#define IDC_DISPLAY3DENSAVE_PURCHASE 110 + +// display3DENRename +#define IDD_DISPLAY3DENRENAME 320 +#define IDC_DISPLAY3DENRENAME_NAME 101 + +// display3DENEditAttributes +#define IDD_DISPLAY3DENEDITATTRIBUTES 315 +#define IDC_DISPLAY3DENEDITATTRIBUTES_TITLE 200 +#define IDC_DISPLAY3DENEDITATTRIBUTES_CATEGORIES 201 + +#define IDC_DISPLAY3DENEDITATTRIBUTES_TYPE_VALUE 500 +#define IDC_DISPLAY3DENEDITATTRIBUTES_TYPE_SEARCH 501 +#define IDC_DISPLAY3DENEDITATTRIBUTES_TYPE_SEARCHBUTTON 502 + +// display3DENEditComposition +#define IDD_DISPLAY3DENEDITCOMPOSITION 317 +#define IDC_DISPLAY3DENEDITCOMPOSITION_NAME 101 +#define IDC_DISPLAY3DENEDITCOMPOSITION_AUTHOR 102 +#define IDC_DISPLAY3DENEDITCOMPOSITION_CATEGORY 103 +#define IDC_DISPLAY3DENEDITCOMPOSITION_SUBCATEGORY 104 + +// display3DENUpdates +#define IDD_DISPLAY3DENUPDATES 330 +#define IDC_DISPLAY3DENUPDATES_TITLE 200 +#define IDC_DISPLAY3DENUPDATES_LIST 201 +#define IDC_DISPLAY3DENUPDATES_GROUP 202 +#define IDC_DISPLAY3DENUPDATES_CONTENT 203 + +// display3DENNew +#define IDD_DISPLAY3DENNEW 316 +#define IDC_DISPLAY3DENNEW_LIST 101 +#define IDC_DISPLAY3DENNEW_PURCHASE 107 +#define IDC_DISPLAY3DENNEW_TITLE 24691 +#define IDC_DISPLAY3DENNEW_NAME 24693 +#define IDC_DISPLAY3DENNEW_AUTHOR 24694 +#define IDC_DISPLAY3DENNEW_NAMEBACKGROUND 24695 +#define IDC_DISPLAY3DENNEW_ISLANDPANORAMA 24891 +#define IDC_DISPLAY3DENNEW_ISLANDGROUP 25991 +#define IDC_DISPLAY3DENNEW_BUTTONCONTINUE3D 26091 +#define IDC_DISPLAY3DENNEW_BUTTONCONTINUE 26291 +#define IDC_DISPLAY3DENNEW_BUTTONCANCEL 26391 +#define IDC_DISPLAY3DENNEW_WORLD 1001 +#define IDC_DISPLAY3DENNEW_WORLDLNG 1002 +#define IDC_DISPLAY3DENNEW_WORLDLAT 1003 + +// display3DENHostSettings +#define IDD_DISPLAY3DENHOSTSETTINGS 317 +#define IDD_DISPLAY3DENHOSTSETTINGS_NAME 101 +#define IDD_DISPLAY3DENHOSTSETTINGS_PASSWORD 102 +#define IDD_DISPLAY3DENHOSTSETTINGS_MAX_PLAYERS 103 +#define IDD_DISPLAY3DENHOSTSETTINGS_PRIVATE 104 +#define IDD_DISPLAY3DENHOSTSETTINGS_PORT 105 +#define IDD_DISPLAY3DENHOSTSETTINGS_PORT_WARNING 106 +#define IDD_DISPLAY3DENHOSTSETTINGS_UPNP 107 + +// display3DENTutorial +#define IDD_DISPLAY3DENTUTORIAL 318 +#define IDC_DISPLAY3DENTUTORIAL_TITLE 200 +#define IDC_DISPLAY3DENTUTORIAL_LIST 201 +#define IDC_DISPLAY3DENTUTORIAL_GROUP 202 +#define IDC_DISPLAY3DENTUTORIAL_CONTENT 203 + +// display3DENCopy +#define IDD_DISPLAY3DENCOPY 319 +#define IDC_DISPLAY3DENCOPY_TITLE 200 +#define IDC_DISPLAY3DENCOPY_GROUP 201 +#define IDC_DISPLAY3DENCOPY_EDIT 202 +#define IDC_DISPLAY3DENCOPY_BUTTONCOPY 204 + +// display3DENRequiredAddons +#define IDD_DISPLAY3DENREQUIREDADDONS 322 +#define IDC_DISPLAY3DENREQUIREDADDONS_LIST 101 +#define IDC_DISPLAY3DENREQUIREDADDONS_CODE 102 +#define IDC_DISPLAY3DENREQUIREDADDONS_NOTIFICATION 103 +#define IDC_DISPLAY3DENREQUIREDADDONS_WARNING 104 +#define IDC_DISPLAY3DENREQUIREDADDONS_NAME 105 +#define IDC_DISPLAY3DENREQUIREDADDONS_AUTHOR 106 +#define IDC_DISPLAY3DENREQUIREDADDONS_URL 107 +#define IDC_DISPLAY3DENREQUIREDADDONS_LOADANYWAY 108 +#define IDC_DISPLAY3DENREQUIREDADDONS_BASIC 1001 +#define IDC_DISPLAY3DENREQUIREDADDONS_ADVANCED 1002 +#define IDC_DISPLAY3DENREQUIREDADDONS_FILTER 1003 + +// display3DENMissionStats +#define IDD_DISPLAY3DENMISSIONSTATS 323 +#define IDC_DISPLAY3DENMISSIONSTATS_TITLE 200 +#define IDC_DISPLAY3DENMISSIONSTATS_GROUP 201 +#define IDC_DISPLAY3DENMISSIONSTATS_STATS 202 +#define IDC_DISPLAY3DENMISSIONSTATS_BUTTONSELECT 203 + + +// RscDisplaySelectIsland +#define IDC_SELECT_ISLAND_EDITOR_OLD 105 +#define IDC_SELECT_ISLAND_3DEN 106 + +// RscDisplayCustomArcade +#define IDC_CUST_3DEN 106 + +// RscDIsplayPublishMission +#define IDD_PUBLISH_MISSION 165 +#define IDC_PUBLISH_STEAM_TITLE 101 +#define IDC_PUBLISH_STEAM_TAGS 102 +#define IDC_PUBLISH_STEAM_PICTURE 103 +#define IDC_PUBLISH_STEAM_DESCRIPTION 104 +#define IDC_PUBLISH_STEAM_MISSION_LIST 105 +#define IDC_PUBLISH_STEAM_VISIBILITY 106 +#define IDC_PUBLISH_STEAM_CHANGE_NOTES 107 +#define IDC_PUBLISH_STEAM_PREVIEW_FILE 108 +#define IDC_PUBLISH_CHECKBOX_LICENCE 109 +#define IDC_PUBLISH_TEXT_MISSION_SIZE 110 +#define IDC_PUBLISH_TEXT_QUOTA 111 +#define IDC_PUBLISH_BUTTON_PUBLISH 112 +#define IDC_PUBLISH_BUTTON_UPDATE 113 +#define IDC_PUBLISH_BUTTON_DELETE 114 +#define IDC_PUBLISH_BUTTON_EDIT_TAGS 115 +#define IDC_PUBLISH_BUTTON_WORKSHOP 116 +#define IDC_PUBLISH_BUTTON_WORKSHOP_LICENCE 117 +#define IDC_PUBLISH_BUTTON_SELECT_PREVIEW 118 +#define IDC_PUBLISH_BUTTON_DEFAULT_PREVIEW 119 +#define IDC_PUBLISH_STORAGE_SLIDER 120 +#define IDC_PUBLISH_STEAM_HIDE_NEW_MISSION 121 +#define IDC_PUBLISH_STEAM_SHOW_NEW_MISSION 122 + +// RscDisplayFileSelectImage +#define IDD_FILE_SELECT_DIALOG 167 +#define IDC_FILE_SELECT_PATH 101 +#define IDC_FILE_SELECT_DIR_TREE 102 +#define IDC_FILE_SELECT_FILE_LIST 103 +#define IDC_FILE_SELECT_PREVIEW 104 + +// RscDisplayPublishMissionSelectTags +#define IDD_PUBLISH_MISSION_TAGS 166 +#define IDC_PUBLISH_STEAM_TAGS_AVAILABLE 101 +#define IDC_PUBLISH_STEAM_TAGS_SELECTED 102 +#define IDC_PUBLISH_STEAM_TAGS_ADD 103 +#define IDC_PUBLISH_STEAM_TAGS_REMOVE 104 +#define IDC_PUBLISH_STEAM_TAGS_NEXT 105 +#define IDC_PUBLISH_STEAM_TAGS_BACK 106 +#define IDC_PUBLISH_STEAM_TAGS_TITLE 107 + + + +// publish / update composition to steam +#define IDD_PUBLISH_COMPOSITION 187 +#define IDC_PUBLISH_COMPOSITION_STEAM_TITLE 101 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS 102 +#define IDC_PUBLISH_COMPOSITION_STEAM_PICTURE 103 +#define IDC_PUBLISH_COMPOSITION_STEAM_DESCRIPTION 104 +#define IDC_PUBLISH_COMPOSITION_STEAM_LIST 105 +#define IDC_PUBLISH_COMPOSITION_STEAM_VISIBILITY 106 +#define IDC_PUBLISH_COMPOSITION_STEAM_CHANGE_NOTES 107 +#define IDC_PUBLISH_COMPOSITION_STEAM_PREVIEW_FILE 108 +#define IDC_PUBLISH_COMPOSITION_CHECKBOX_LICENCE 109 +#define IDC_PUBLISH_COMPOSITION_TEXT_SIZE 110 +#define IDC_PUBLISH_COMPOSITION_TEXT_QUOTA 111 +#define IDC_PUBLISH_COMPOSITION_BUTTON_PUBLISH 112 +#define IDC_PUBLISH_COMPOSITION_BUTTON_UPDATE 113 +#define IDC_PUBLISH_COMPOSITION_BUTTON_DELETE 114 +#define IDC_PUBLISH_COMPOSITION_BUTTON_EDIT_TAGS 115 +#define IDC_PUBLISH_COMPOSITION_BUTTON_WORKSHOP 116 +#define IDC_PUBLISH_COMPOSITION_BUTTON_WORKSHOP_LICENCE 117 +#define IDC_PUBLISH_COMPOSITION_BUTTON_SELECT_PREVIEW 118 +#define IDC_PUBLISH_COMPOSITION_BUTTON_DEFAULT_PREVIEW 119 +#define IDC_PUBLISH_COMPOSITION_STORAGE_SLIDER 120 +// group that is hidden when new mission is selected and shown when already uploaded mission is selected +#define IDC_PUBLISH_COMPOSITION_STEAM_HIDE_NEW 121 +// group that is shown when new mission is selected and hidden when already uploaded mission is selected +#define IDC_PUBLISH_COMPOSITION_STEAM_SHOW_NEW 122 + +// publish / update to Steam workshop - tags dialog +#define IDD_PUBLISH_COMPOSITION_TAGS 188 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_AVAILABLE 101 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_SELECTED 102 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_ADD 103 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_REMOVE 104 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_NEXT 105 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_BACK 106 +#define IDC_PUBLISH_COMPOSITION_STEAM_TAGS_TITLE 107 + + +// Highlight +#define IDD_GROUPHIGHLIGHT 31313 + +// Tutorial +#define IDD_GROUPTUTORIAL 32323 +#define IDD_GROUPTUTORIAL_SHADOW 323231 +#define IDD_GROUPTUTORIAL_BACKGROUND 323232 +#define IDD_GROUPTUTORIAL_TEXT 323233 +#define IDD_GROUPTUTORIAL_PAGE 323234 +#define IDD_GROUPTUTORIAL_BUTTONCLOSE 323235 +#define IDD_GROUPTUTORIAL_BUTTONBACK 323236 +#define IDD_GROUPTUTORIAL_BUTTONNEXT 323237 +#define IDD_GROUPTUTORIAL_BUTTONEXIT 323238 \ No newline at end of file diff --git a/include/a3/ui_f/hpp/defineResinclDesign.inc b/include/a3/ui_f/hpp/defineResinclDesign.inc new file mode 100644 index 000000000..0c669371e --- /dev/null +++ b/include/a3/ui_f/hpp/defineResinclDesign.inc @@ -0,0 +1,1063 @@ +#define IDC_SEARCH 645 +#define IDC_SEARCH_BUTTON 646 + +//--- RscDisplayMain +#define IDC_MAIN_GAMEMODES 201 +#define IDC_MAIN_MP_SCENARIOS 202 +#define IDC_MAIN_ARSENAL 203 +#define IDC_MAIN_COMMUNITYGUIDES 204 +#define IDC_MAIN_PROFILE 205 +#define IDC_MAIN_CAMPAIGN_MP 206 + +#define IDC_MAIN_MOUSEAREA 999 +#define IDC_MAIN_BACKGROUND_PICTURE 998 +#define IDC_MAIN_BACKGROUND_BLACK 997 + +#define IDC_MAIN_GROUP_SINGLEPLAYER 1001 +#define IDC_MAIN_GROUP_MULTIPLAYER 1002 +#define IDC_MAIN_GROUP_TUTORIALS 1003 +#define IDC_MAIN_GROUP_OPTIONS 1004 +#define IDC_MAIN_GROUP_SESSION 1005 + +#define IDC_MAIN_TITLE_SINGLEPLAYER 1011 +#define IDC_MAIN_TITLE_MULTIPLAYER 1012 +#define IDC_MAIN_TITLE_TUTORIALS 1013 +#define IDC_MAIN_TITLE_OPTIONS 1014 +#define IDC_MAIN_TITLE_SESSION 1015 + +#define IDC_MAIN_TITLEICON_SINGLEPLAYER 1111 +#define IDC_MAIN_TITLEICON_MULTIPLAYER 1112 +#define IDC_MAIN_TITLEICON_TUTORIALS 1113 +#define IDC_MAIN_TITLEICON_OPTIONS 1114 +#define IDC_MAIN_TITLEICON_SESSION 1115 + +#define IDC_MAIN_SPOTLIGHT_GROUP_1 1020 +#define IDC_MAIN_SPOTLIGHT_GROUP_2 1021 +#define IDC_MAIN_SPOTLIGHT_GROUP_3 1022 +#define IDC_MAIN_SPOTLIGHT_PICTURE 1023 +#define IDC_MAIN_SPOTLIGHT_VIDEO 1024 +#define IDC_MAIN_SPOTLIGHT_HOVER 1025 +#define IDC_MAIN_SPOTLIGHT_BUTTON 1026 +#define IDC_MAIN_SPOTLIGHT_ACTION 1027 +#define IDC_MAIN_SPOTLIGHT_TEXT 1028 +#define IDC_MAIN_SPOTLIGHT_TEXTBCG 1029 + +#define IDC_MAIN_SPOTLIGHT_PREV 1060 +#define IDC_MAIN_SPOTLIGHT_NEXT 1061 + +#define IDC_MAIN_INFO_MODS 1030 +#define IDC_MAIN_INFO_DLCS 1031 +#define IDC_MAIN_INFO_DLCSOWNED 10311 +#define IDC_MAIN_INFO_NEWS 1032 +#define IDC_MAIN_INFO_VERSION 1033 + +#define IDC_MAIN_INFO_BACKGROUND 1034 +#define IDC_MAIN_INFO_BACKGROUND_ICON 1035 +#define IDC_MAIN_INFO_ICON 1036 +#define IDC_MAIN_INFO_BUTTON 1037 +#define IDC_MAIN_INFO_BUTTON_DEV 1038 +#define IDC_MAIN_INFO_NOTIFICATION 1039 + +#define IDC_MAIN_VERSION_DEV 1050 + +#define BARCOLOR 0, 0, 0, 0.75 +#define INFO_BACKGROUND_COLOR BARCOLOR +#define INFO_ICON_COLOR 1, 1, 1, 0.5 + +//--- RscDisplayDebug +#define IDC_RSCDISPLAYDEBUG_DESIGNHTML 11735 +#define IDC_RSCDISPLAYDEBUG_TEXTEXPRESSION 11736 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR1 11737 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR2 11738 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR3 11739 +#define IDC_RSCDISPLAYDEBUG_TEXTVAR4 11740 +#define IDC_RSCDISPLAYDEBUG_TEXTWATCH 11741 +#define IDC_RSCDISPLAYDEBUG_DIAGTEXT 11747 +#define IDC_RSCDISPLAYDEBUG_DRAWTEXT 11748 +#define IDC_RSCDISPLAYDEBUG_CA_TITLE 11838 +#define IDC_RSCDISPLAYDEBUG_CA_PLAYER 12145 +#define IDC_RSCDISPLAYDEBUG_CA_VERSION 12146 +#define IDC_RSCDISPLAYDEBUG_DIAGLIST 12236 +#define IDC_RSCDISPLAYDEBUG_DIAGLIST_SEARCH 12238 +#define IDC_RSCDISPLAYDEBUG_DRAWLIST 12237 +#define IDC_RSCDISPLAYDEBUG_DIAGFRAME 12535 +#define IDC_RSCDISPLAYDEBUG_DRAWFRAME 12536 +#define IDC_RSCDISPLAYDEBUG_FRAMELOG 12537 +#define IDC_RSCDISPLAYDEBUG_G_EXPRESSION 13035 +#define IDC_RSCDISPLAYDEBUG_G_DIAG 13036 +#define IDC_RSCDISPLAYDEBUG_G_DESIGN 13037 +#define IDC_RSCDISPLAYDEBUG_G_WATCH 13038 +#define IDC_RSCDISPLAYDEBUG_G_DRAW 13039 +#define IDC_RSCDISPLAYDEBUG_DIAGBUTTON 13138 +#define IDC_RSCDISPLAYDEBUG_DRAWBUTTON 13139 +#define IDC_RSCDISPLAYDEBUG_DEBUGFLOW 13140 +#define IDC_RSCDISPLAYDEBUG_DEBUGANIM 13141 +#define IDC_RSCDISPLAYDEBUG_B_CAMERANEW 13142 +#define IDC_RSCDISPLAYDEBUG_CREATEJIRAISSUE 13143 +#define IDC_RSCDISPLAYDEBUG_DEBUGGUI 13144 +#define IDC_RSCDISPLAYDEBUG_DEBUGFUNCTIONS 13145 +#define IDC_RSCDISPLAYDEBUG_DEBUGCONFIG 13154 +#define IDC_RSCDISPLAYDEBUG_B_CAMERA 13155 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT1 13157 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT2 13158 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT3 13159 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT4 13160 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT5 13161 +#define IDC_RSCDISPLAYDEBUG_BUTTONSCRIPT6 13163 +#define IDC_RSCDISPLAYDEBUG_DEBUGCAPTURE 13164 + +//--- RscDisplayAnimViewer +#define IDC_RSCDISPLAYANIMVIEWER_TITLE 1000 +#define IDC_RSCDISPLAYANIMVIEWER_BACKGROUND 1001 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTACTION 1002 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTPOSE 1003 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTMOVEMENT 1004 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTSTANCE 1005 +#define IDC_RSCDISPLAYANIMVIEWER_TEXTITEM 1006 +#define IDC_RSCDISPLAYANIMVIEWER_DESCRIPTION 1100 +#define IDC_RSCDISPLAYANIMVIEWER_MISC 1500 +#define IDC_RSCDISPLAYANIMVIEWER_ACTION 2100 +#define IDC_RSCDISPLAYANIMVIEWER_POSE 2101 +#define IDC_RSCDISPLAYANIMVIEWER_MOVEMENT 2102 +#define IDC_RSCDISPLAYANIMVIEWER_STANCE 2103 +#define IDC_RSCDISPLAYANIMVIEWER_ITEM 2104 +#define IDC_RSCDISPLAYANIMVIEWER_SOLDIER 2106 +#define IDC_RSCDISPLAYANIMVIEWER_BUTTONCLOSE 2700 + +#define IDC_RSCDISPLAYANIMVIEWER_MOUSEAREA 999 +#define IDC_RSCDISPLAYANIMVIEWER 1320 + +//--- RscDisplayFunctionsViewer +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TITLEBACKGROUND 1000 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BACKGROUNDLEFT 1001 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BACKGROUNDRIGHT 1002 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BACKGROUNDMETA 1003 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TITLETEXT 1004 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_AUTHOR 1005 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_CODESTRUCTURED 1100 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TITLEICON 1200 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_CODE 1400 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_NAME 1401 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_FUNCTIONS 1500 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_SOURCES 2100 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_TAGS 2101 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_CATEGORIES 2102 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_PREVIEW 2300 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BUTTONRECOMPILE_ALL 2400 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BUTTONRECOMPILE_SELECTED 2401 +#define IDC_RSCDISPLAYFUNCTIONSVIEWER_BUTTONCLOSE 2700 + +#define IDC_RSCDISPLAYFUNCTIONSVIEWER 1321 + +//--- Loading +#define IDC_LOADING_MAPBACKTOP 1000 +#define IDC_LOADING_MAPNAME 1001 +#define IDC_LOADING_MAPAUTHOR 1002 +#define IDC_LOADING_MAPBACKBOTTOM 1003 +#define IDC_LOADING_MISSIONBACKGROUNDTOP 1005 +#define IDC_LOADING_MISSIONNAME 1006 +#define IDC_LOADING_MISSIONAUTHOR 1007 +#define IDC_LOADING_PROGRESSMAP 1008 +#define IDC_LOADING_DISCLAIMERNAME 1009 +#define IDC_LOADING_MISSIONPICTUREBACK 1010 +#define IDC_LOADING_MISSIONGAMETYPE 1012 +#define IDC_LOADING_PROGRESSMISSION 1013 +#define IDC_LOADING_MISSIONDESCRIPTION 1100 +#define IDC_LOADING_DISCLAIMERDESCRIPTION 1101 +#define IDC_LOADING_MAPDESCRIPTION 1102 +#define IDC_LOADING_MISSION 2300 +#define IDC_LOADING_DISCLAIMER 2301 +//--- Loading - DLC part +#define IDC_LOADING_DLCNAME 3207 +#define IDC_LOADING_DLCAUTHOR 3208 +#define IDC_LOADING_DLCPICTUREBACK 3209 +#define IDC_LOADING_DLCDESCRIPTION 3296 +#define IDC_LOADING_DLCPICTURE 3393 +#define IDC_LOADING_DLCSTRIPE 3395 +#define IDC_LOADING_DLCICON 3396 + +#define IDC_LOADING_MAP 999 + +//--- LoadingStart +#define IDC_LOADINGSTART_BLACK 1000 +#define IDC_LOADINGSTART_LOGO 1200 +#define IDC_LOADINGSTART_NOISE 1201 +#define IDC_LOADINGSTART_LOADINGSTART 2310 + +//--- RscDisplayDebriefing +#define IDC_RSCDISPLAYDEBRIEFING_LISTGROUP 21903 //Defined manually +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE 21904 +#define IDC_RSCDISPLAYDEBRIEFING_TIMEBACKGROUND 20594 +#define IDC_RSCDISPLAYDEBRIEFING_MAINBACKGROUND 20595 +#define IDC_RSCDISPLAYDEBRIEFING_RATINGBACKGROUND 20596 +#define IDC_RSCDISPLAYDEBRIEFING_PLAYERNAME 20599 +#define IDC_RSCDISPLAYDEBRIEFING_TITLE 20600 +#define IDC_RSCDISPLAYDEBRIEFING_SUBTITLE 20601 +#define IDC_RSCDISPLAYDEBRIEFING_OBJECTIVESBACKGROUND 20602 +#define IDC_RSCDISPLAYDEBRIEFING_STATBACKGROUND 20603 +#define IDC_RSCDISPLAYDEBRIEFING_DESCRIPTIONBACKGROUND 20604 +#define IDC_RSCDISPLAYDEBRIEFING_LOADSBACKGROUND 20605 +#define IDC_RSCDISPLAYDEBRIEFING_RATINGTEXT 20606 +#define IDC_RSCDISPLAYDEBRIEFING_RATING 20607 +#define IDC_RSCDISPLAYDEBRIEFING_RATINGBEST 20608 +#define IDC_RSCDISPLAYDEBRIEFING_TIMETEXT 20609 +#define IDC_RSCDISPLAYDEBRIEFING_TIME 20610 +#define IDC_RSCDISPLAYDEBRIEFING_TIMEBEST 20611 +#define IDC_RSCDISPLAYDEBRIEFING_LOADSTEXT 20612 +#define IDC_RSCDISPLAYDEBRIEFING_LOADS 20613 +#define IDC_RSCDISPLAYDEBRIEFING_LOADSBEST 20614 +#define IDC_RSCDISPLAYDEBRIEFING_DLCOVERVIEWBACKGROUND 20615 +#define IDC_RSCDISPLAYDEBRIEFING_DLCOVERVIEWTEXT 20616 +#define IDC_RSCDISPLAYDEBRIEFING_DLCCOUNTDOWN 20617 +#define IDC_RSCDISPLAYDEBRIEFING_TABSBACKGROUND 20618 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBAR 20619 +#define IDC_RSCDISPLAYDEBRIEFING_DESCRIPTIONTEXT 20693 +#define IDC_RSCDISPLAYDEBRIEFING_CUSTOMTEXT 20694 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE1 20696 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE2 20697 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE3 20698 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE4 20699 +#define IDC_RSCDISPLAYDEBRIEFING_SIDE5 20700 +#define IDC_RSCDISPLAYDEBRIEFING_PICTURE 20793 +#define IDC_RSCDISPLAYDEBRIEFING_MISSIONPICTURE 20794 +#define IDC_RSCDISPLAYDEBRIEFING_DLCOVERVIEWPICTURE 20795 +#define IDC_RSCDISPLAYDEBRIEFING_DLCLOCKICON 20798 +#define IDC_RSCDISPLAYDEBRIEFING_SECTION 21093 +#define IDC_RSCDISPLAYDEBRIEFING_SUMMARY 21893 +#define IDC_RSCDISPLAYDEBRIEFING_DESCRIPTION 21894 +#define IDC_RSCDISPLAYDEBRIEFING_OBJECTIVES 21895 +#define IDC_RSCDISPLAYDEBRIEFING_STAT 21896 +#define IDC_RSCDISPLAYDEBRIEFING_CUSTOM 21897 +#define IDC_RSCDISPLAYDEBRIEFING_DATA 21898 +#define IDC_RSCDISPLAYDEBRIEFING_SIDES 21899 +#define IDC_RSCDISPLAYDEBRIEFING_DLCGENERALGROUP 21900 +#define IDC_RSCDISPLAYDEBRIEFING_LOAC 21901 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONALLASSETS 21995 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONKARTS 21996 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONHELI 21997 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONMARKSMEN 21998 +#define IDC_RSCDISPLAYDEBRIEFING_DLCBUTTONAPEX 22000 + +//--- RscDisplayDebriefing - DLC item template +#define IDC_RSCDISPLAYDEBRIEFING_ITEMBACKGROUND 20623 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMBACKGROUNDBLACK 20624 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMNAME 20625 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMTEXTSESSIONTIME 20626 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMSESSIONTIME 20627 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMTEXTTOTALTIME 20628 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMTOTALTIME 20629 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMDESCRIPTION 20630 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMPICTURE 20796 +#define IDC_RSCDISPLAYDEBRIEFING_ITEMDLCLOGO 20797 +#define IDC_RSCDISPLAYDEBRIEFING_RSCDISPLAYDEBRIEFING_ITEMTEMPLATE 21902 +#define IDC_RSCDISPLAYDEBRIEFING_BUTTONPURCHASE 21999 + +//--- RscDisplayDebriefing_LOACTemplate +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_BACKGROUND 52605 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_TITLE 52705 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_TEXT 52706 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_PICTURE 52805 +#define IDC_RSCDISPLAYDEBRIEFING_LOACTEMPLATE_TEXTGROUP 53905 + + +//--- RscDebugConsole +#define IDC_RSCDEBUGCONSOLE_TITLE 11884 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONBACKGROUND 11885 +#define IDC_RSCDEBUGCONSOLE_WATCHBACKGROUND 11886 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND1 11887 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND2 11888 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND3 11889 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUTBACKGROUND4 11890 +#define IDC_RSCDEBUGCONSOLE_LINK 11891 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONTEXT 11892 +#define IDC_RSCDEBUGCONSOLE_WATCHTEXT 11893 +#define IDC_RSCDEBUGCONSOLE_EXPRESSION 12284 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT1 12285 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT1 12286 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT2 12287 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT2 12288 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT3 12289 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT3 12290 +#define IDC_RSCDEBUGCONSOLE_WATCHINPUT4 12291 +#define IDC_RSCDEBUGCONSOLE_WATCHOUTPUT4 12293 +#define IDC_RSCDEBUGCONSOLE_RSCDEBUGCONSOLE 13184 +#define IDC_RSCDEBUGCONSOLE_BUTTONCODEPERFORMANCE 13284 +#define IDC_RSCDEBUGCONSOLE_BUTTONEXECUTEALL 13285 +#define IDC_RSCDEBUGCONSOLE_BUTTONEXECUTESERVER 13286 +#define IDC_RSCDEBUGCONSOLE_BUTTONSPECTATORCAMERA 13287 +#define IDC_RSCDEBUGCONSOLE_BUTTONSPLENDIDCAMERA 13288 +#define IDC_RSCDEBUGCONSOLE_BUTTONFUNCTIONS 13289 +#define IDC_RSCDEBUGCONSOLE_BUTTONCONFIG 13290 +#define IDC_RSCDEBUGCONSOLE_BUTTONANIMATIONS 13291 +#define IDC_RSCDEBUGCONSOLE_BUTTONGUI 13292 +#define IDC_RSCDEBUGCONSOLE_BUTTONEXECUTELOCAL 13484 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONOUTPUT 13190 +#define IDC_RSCDEBUGCONSOLE_EXPRESSIONOUTPUTBACKGROUND 13191 + + + +//--- RscDisplayOptionsLayout +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TITLE 1000 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BACKGROUND 1001 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TAGSTEXT 1002 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_PRESETSLABEL 1003 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_MOUSEAREA 1004 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_CENTERW 1005 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_CENTERH 1006 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TOOLTIP 1100 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_TAGS 2100 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_PRESETS 2101 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BUTTONSAVE 2400 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BUTTONOK 2600 +#define IDC_RSCDISPLAYOPTIONSLAYOUT_BUTTONCANCEL 2700 + +//--- RscDisplayRespawn +#define IDC_RSCDISPLAYRESPAWN_TITLE 1000 +#define IDC_RSCDISPLAYRESPAWN_LISTBACKGROUND 1001 +#define IDC_RSCDISPLAYRESPAWN_SECTION 1002 +#define IDC_RSCDISPLAYRESPAWN_BLACK 1003 +#define IDC_RSCDISPLAYRESPAWN_CONTENTBACKGROUND 1004 +#define IDC_RSCDISPLAYRESPAWN_BLACKCONTENT 1005 +#define IDC_RSCDISPLAYRESPAWN_PLAYERSNAME 1006 +#define IDC_RSCDISPLAYRESPAWN_CONTENT 1100 +#define IDC_RSCDISPLAYRESPAWN_LIST 1500 +#define IDC_RSCDISPLAYRESPAWN_CONTENTGROUP 2300 +#define IDC_RSCDISPLAYRESPAWN_BUTTONOK 2600 +#define IDC_RSCDISPLAYRESPAWN_BUTTONCANCEL 2700 + +#define IDC_RSCDISPLAYRESPAWN_MAP 1050 + +//--- RscDisplaySelectIsland +#define IDC_RSCDISPLAYSELECTISLAND_TITLE 1000 +#define IDC_RSCDISPLAYSELECTISLAND_NAME 1002 +#define IDC_RSCDISPLAYSELECTISLAND_AUTHOR 1003 +#define IDC_RSCDISPLAYSELECTISLAND_NAMEBACKGROUND 1004 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDPANORAMA 1200 +#define IDC_RSCDISPLAYSELECTISLAND_INTERLACING 1201 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD1 1202 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD2 1203 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD3 1204 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD4 1205 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDGROUP 2300 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE 2600 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCANCEL 2700 + +//--- RscSpectator +#define IDC_RSCSPECTATOR_PLAYERNAMEBACKGROUND 1000 +#define IDC_RSCSPECTATOR_PLAYERGROUP 1001 +#define IDC_RSCSPECTATOR_PLAYERNAME 1002 +#define IDC_RSCSPECTATOR_PLAYERDESCRIPTION 1100 +#define IDC_RSCSPECTATOR_PLAYERICON 1200 +#define IDC_RSCSPECTATOR_PLAYER 2300 + +//--- RscMissionEnd +#define IDC_RSCMISSIONEND_TITLE 8942 +#define IDC_RSCMISSIONEND_SUBTITLE 8943 +#define IDC_RSCMISSIONEND_SIDE1 9045 +#define IDC_RSCMISSIONEND_SIDE2 9046 +#define IDC_RSCMISSIONEND_SIDE3 9047 +#define IDC_RSCMISSIONEND_SIDE4 9048 +#define IDC_RSCMISSIONEND_SIDE5 9049 +#define IDC_RSCMISSIONEND_PICTURE 9142 +#define IDC_RSCMISSIONEND_SIDES 10248 + +//--- RscNotification +#define IDC_RSCNOTIFICATION_TITLE 12135 +#define IDC_RSCNOTIFICATION_PICTUREBACKGROUND 12136 +#define IDC_RSCNOTIFICATION_SCORE 12137 +#define IDC_RSCNOTIFICATION_DESCRIPTIONBACKGROUND 12138 +#define IDC_RSCNOTIFICATION_DESCRIPTION 12235 +#define IDC_RSCNOTIFICATION_PICTURE 12335 +#define IDC_RSCNOTIFICATION_NOTIFICATION 13435 + +#define IDC_RSCNOTIFICATION_NOTIFICATIONAREA 312 + +//--- RscCommMenuItems +#define IDC_RSCCOMMMENUITEMS_SLOT1BACKGROUND 1000 +#define IDC_RSCCOMMMENUITEMS_SLOT2BACKGROUND 1001 +#define IDC_RSCCOMMMENUITEMS_SLOT3BACKGROUND 1002 +#define IDC_RSCCOMMMENUITEMS_SLOT4BACKGROUND 1003 +#define IDC_RSCCOMMMENUITEMS_SLOT5BACKGROUND 1004 +#define IDC_RSCCOMMMENUITEMS_SLOT6BACKGROUND 1005 +#define IDC_RSCCOMMMENUITEMS_SLOT7BACKGROUND 1006 +#define IDC_RSCCOMMMENUITEMS_SLOT8BACKGROUND 1007 +#define IDC_RSCCOMMMENUITEMS_SLOT9BACKGROUND 1008 +#define IDC_RSCCOMMMENUITEMS_SLOT0BACKGROUND 1009 +#define IDC_RSCCOMMMENUITEMS_SLOT1TEXT 1010 +#define IDC_RSCCOMMMENUITEMS_SLOT1 1200 +#define IDC_RSCCOMMMENUITEMS_SLOT2 1201 +#define IDC_RSCCOMMMENUITEMS_SLOT3 1202 +#define IDC_RSCCOMMMENUITEMS_SLOT4 1203 +#define IDC_RSCCOMMMENUITEMS_SLOT5 1204 +#define IDC_RSCCOMMMENUITEMS_SLOT6 1205 +#define IDC_RSCCOMMMENUITEMS_SLOT7 1206 +#define IDC_RSCCOMMMENUITEMS_SLOT8 1207 +#define IDC_RSCCOMMMENUITEMS_SLOT9 1208 +#define IDC_RSCCOMMMENUITEMS_SLOT0 1209 +#define IDC_RSCCOMMMENUITEMS_SLOT2TEXT 1210 +#define IDC_RSCCOMMMENUITEMS_SLOT3TEXT 1211 +#define IDC_RSCCOMMMENUITEMS_SLOT4TEXT 1212 +#define IDC_RSCCOMMMENUITEMS_SLOT5TEXT 1213 +#define IDC_RSCCOMMMENUITEMS_SLOT6TEXT 1214 +#define IDC_RSCCOMMMENUITEMS_SLOT7TEXT 1215 +#define IDC_RSCCOMMMENUITEMS_SLOT8TEXT 1216 +#define IDC_RSCCOMMMENUITEMS_SLOT9TEXT 1217 +#define IDC_RSCCOMMMENUITEMS_SLOT0TEXT 1218 +#define IDC_RSCCOMMMENUITEMS_RSCCOMMMENUITEMS 2300 + +//--- RscRespawnCounter +#define IDC_RSCRESPAWNCOUNTER_MPTABLE 1000 +#define IDC_RSCRESPAWNCOUNTER_TITLE 1001 +#define IDC_RSCRESPAWNCOUNTER_TITLEBACKGROUND 1002 +#define IDC_RSCRESPAWNCOUNTER_PLAYERRESPAWNTIME 1003 +#define IDC_RSCRESPAWNCOUNTER_DESCRIPTION 1100 + +//--- RscFiringDrillTime +#define IDC_RSCFIRINGDRILLTIME_CURRENTBACKGROUND 1100 +#define IDC_RSCFIRINGDRILLTIME_BEST 1101 +#define IDC_RSCFIRINGDRILLTIME_PREVIOUS 1102 +#define IDC_RSCFIRINGDRILLTIME_BONUS 1103 +#define IDC_RSCFIRINGDRILLTIME_CURRENT 1104 +#define IDC_RSCFIRINGDRILLTIME_PENALTY 1105 +#define IDC_RSCFIRINGDRILLTIME_TIME 2300 + +//--- RscFiringDrillCheckpoint +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINTBACKGROUND 1000 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETBACKGROUND 1001 +#define IDC_RSCFIRINGDRILLCHECKPOINT_STANCEBACKGROUND 1002 +#define IDC_RSCFIRINGDRILLCHECKPOINT_WEAPONBACKGROUND 1003 +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINTTEXT 1004 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETTEXTTOTAL 1005 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETTEXTCURRENT 1006 +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINTPICTURE 1200 +#define IDC_RSCFIRINGDRILLCHECKPOINT_STANCEPICTURE 1201 +#define IDC_RSCFIRINGDRILLCHECKPOINT_WEAPONPICTURE 1202 +#define IDC_RSCFIRINGDRILLCHECKPOINT_TARGETPICTURE 1203 +#define IDC_RSCFIRINGDRILLCHECKPOINT_CHECKPOINT 2300 + +//--- RscAdvancedHint +#define IDC_RSCADVANCEDHINT_TITLE 11657 +#define IDC_RSCADVANCEDHINT_HINT 11757 +#define IDC_RSCADVANCEDHINT_HINTGROUP 12957 + +//--- RscSectorCapture +#define IDC_RSCSECTORCAPTURE_WEST 1001 +#define IDC_RSCSECTORCAPTURE_EAST 1002 +#define IDC_RSCSECTORCAPTURE_GUER 1003 +#define IDC_RSCSECTORCAPTURE_CIV 1004 +#define IDC_RSCSECTORCAPTURE_NAME 1005 +#define IDC_RSCSECTORCAPTURE_BACKGROUND 1200 +#define IDC_RSCSECTORCAPTURE_SECTORCAPTURE 2300 + +//--- RscMissionStatus +#define IDC_RSCMISSIONSTATUS_BARBRIDGE 13983 +#define IDC_RSCMISSIONSTATUS_BARWEST 13984 +#define IDC_RSCMISSIONSTATUS_BAREAST 13985 +#define IDC_RSCMISSIONSTATUS_BARGUER 13986 +#define IDC_RSCMISSIONSTATUS_BARCIV 13987 +#define IDC_RSCMISSIONSTATUS_BARUNKNOWN 13988 +#define IDC_RSCMISSIONSTATUS_SLOT1BACKGROUND 13989 +#define IDC_RSCMISSIONSTATUS_SLOT1PROGRESS 13990 +#define IDC_RSCMISSIONSTATUS_SLOT2BACKGROUND 13991 +#define IDC_RSCMISSIONSTATUS_SLOT2PROGRESS 13992 +#define IDC_RSCMISSIONSTATUS_SLOT3BACKGROUND 13993 +#define IDC_RSCMISSIONSTATUS_SLOT3PROGRESS 13994 +#define IDC_RSCMISSIONSTATUS_SLOT4BACKGROUND 13995 +#define IDC_RSCMISSIONSTATUS_SLOT4PROGRESS 13996 +#define IDC_RSCMISSIONSTATUS_SLOT5BACKGROUND 13997 +#define IDC_RSCMISSIONSTATUS_SLOT5PROGRESS 13998 +#define IDC_RSCMISSIONSTATUS_SLOT6BACKGROUND 13999 +#define IDC_RSCMISSIONSTATUS_SLOT6PROGRESS 14000 +#define IDC_RSCMISSIONSTATUS_SLOT7BACKGROUND 14001 +#define IDC_RSCMISSIONSTATUS_SLOT7PROGRESS 14002 +#define IDC_RSCMISSIONSTATUS_SLOT8BACKGROUND 14003 +#define IDC_RSCMISSIONSTATUS_SLOT8PROGRESS 14004 +#define IDC_RSCMISSIONSTATUS_SLOT9BACKGROUND 14005 +#define IDC_RSCMISSIONSTATUS_SLOT9PROGRESS 14006 +#define IDC_RSCMISSIONSTATUS_SLOT0BACKGROUND 14007 +#define IDC_RSCMISSIONSTATUS_SLOT0PROGRESS 14008 +#define IDC_RSCMISSIONSTATUS_SLOT1TEXT 14093 +#define IDC_RSCMISSIONSTATUS_SLOT2TEXT 14094 +#define IDC_RSCMISSIONSTATUS_SLOT3TEXT 14095 +#define IDC_RSCMISSIONSTATUS_SLOT4TEXT 14096 +#define IDC_RSCMISSIONSTATUS_SLOT5TEXT 14097 +#define IDC_RSCMISSIONSTATUS_SLOT6TEXT 14098 +#define IDC_RSCMISSIONSTATUS_SLOT7TEXT 14099 +#define IDC_RSCMISSIONSTATUS_SLOT8TEXT 14100 +#define IDC_RSCMISSIONSTATUS_SLOT9TEXT 14101 +#define IDC_RSCMISSIONSTATUS_SLOT0TEXT 14102 +#define IDC_RSCMISSIONSTATUS_SLOT1 14183 +#define IDC_RSCMISSIONSTATUS_SLOT2 14184 +#define IDC_RSCMISSIONSTATUS_SLOT3 14185 +#define IDC_RSCMISSIONSTATUS_SLOT4 14186 +#define IDC_RSCMISSIONSTATUS_SLOT5 14187 +#define IDC_RSCMISSIONSTATUS_SLOT6 14188 +#define IDC_RSCMISSIONSTATUS_SLOT7 14189 +#define IDC_RSCMISSIONSTATUS_SLOT8 14190 +#define IDC_RSCMISSIONSTATUS_SLOT9 14191 +#define IDC_RSCMISSIONSTATUS_SLOT0 14192 +#define IDC_RSCMISSIONSTATUS_RSCMISSIONSTATUS 15283 + +//--- RscFeedback +#define IDC_RSCFEEDBACK_RSCFEEDBACK 6455 + +//--- RscDisplayCommunityGuide +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_TITLE 29956 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_PLAYERSNAME 29957 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_BRIEFINGNAME 29958 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_AUTHOR 29959 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_OVERVIEWTEXT 30056 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_OVERVIEWPICTURE 30156 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_GUIDELIST 30456 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_OVERVIEWCONTROLSGROUP 31256 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_BUTTONPLAY 31556 +#define IDC_RSCDISPLAYCOMMUNITYGUIDE_BUTTONCANCEL 31656 + +//--- RscDisplayArsenal +#define IDC_RSCDISPLAYARSENAL_MOUSEAREA 899 +#define IDC_RSCDISPLAYARSENAL_MOUSEBLOCK 898 +#define IDC_RSCDISPLAYARSENAL_TABS 1800 +#define IDC_RSCDISPLAYARSENAL_FRAMELEFT 1801 +#define IDC_RSCDISPLAYARSENAL_FRAMERIGHT 1802 +#define IDC_RSCDISPLAYARSENAL_LINEICON 1803 +#define IDC_RSCDISPLAYARSENAL_LINETABLEFT 1804 +#define IDC_RSCDISPLAYARSENAL_LINETABLEFTSELECTED 1805 +#define IDC_RSCDISPLAYARSENAL_LINETABRIGHT 1806 +#define IDC_RSCDISPLAYARSENAL_ICON 900 +#define IDC_RSCDISPLAYARSENAL_ICONBACKGROUND 830 +#define IDC_RSCDISPLAYARSENAL_TAB 930 +#define IDC_RSCDISPLAYARSENAL_LIST 960 +#define IDC_RSCDISPLAYARSENAL_SORT 800 +#define IDC_RSCDISPLAYARSENAL_LISTDISABLED 860 +#define IDC_RSCDISPLAYARSENAL_LOAD 990 +#define IDC_RSCDISPLAYARSENAL_LOADCARGO 991 +#define IDC_RSCDISPLAYARSENAL_ARROWLEFT 992 +#define IDC_RSCDISPLAYARSENAL_ARROWRIGHT 993 +#define IDC_RSCDISPLAYARSENAL_BACKGROUNDLEFT 994 +#define IDC_RSCDISPLAYARSENAL_BACKGROUNDRIGHT 995 +#define IDC_RSCDISPLAYARSENAL_MESSAGE 996 + +#define IDC_RSCDISPLAYARSENAL_TAB_PRIMARYWEAPON 0 +#define IDC_RSCDISPLAYARSENAL_TAB_SECONDARYWEAPON 1 +#define IDC_RSCDISPLAYARSENAL_TAB_HANDGUN 2 +#define IDC_RSCDISPLAYARSENAL_TAB_UNIFORM 3 +#define IDC_RSCDISPLAYARSENAL_TAB_VEST 4 +#define IDC_RSCDISPLAYARSENAL_TAB_BACKPACK 5 +#define IDC_RSCDISPLAYARSENAL_TAB_HEADGEAR 6 +#define IDC_RSCDISPLAYARSENAL_TAB_GOGGLES 7 +#define IDC_RSCDISPLAYARSENAL_TAB_NVGS 8 +#define IDC_RSCDISPLAYARSENAL_TAB_BINOCULARS 9 +#define IDC_RSCDISPLAYARSENAL_TAB_MAP 10 +#define IDC_RSCDISPLAYARSENAL_TAB_GPS 11 +#define IDC_RSCDISPLAYARSENAL_TAB_RADIO 12 +#define IDC_RSCDISPLAYARSENAL_TAB_COMPASS 13 +#define IDC_RSCDISPLAYARSENAL_TAB_WATCH 14 +#define IDC_RSCDISPLAYARSENAL_TAB_FACE 15 +#define IDC_RSCDISPLAYARSENAL_TAB_VOICE 16 +#define IDC_RSCDISPLAYARSENAL_TAB_INSIGNIA 17 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMOPTIC 18 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMACC 19 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMMUZZLE 20 +#define IDC_RSCDISPLAYARSENAL_TAB_ITEMBIPOD 25 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOMAG 21 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOTHROW 22 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOPUT 23 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOMISC 24 +#define IDC_RSCDISPLAYARSENAL_TAB_CARGOMAGALL 26 + +#define IDC_RSCDISPLAYARSENAL_WEAPON_WEAPONBACKGROUND 29489 +#define IDC_RSCDISPLAYARSENAL_WEAPON_WEAPONTEXT 29589 +#define IDC_RSCDISPLAYARSENAL_WEAPON_WEAPON 30789 + +#define IDC_RSCDISPLAYARSENAL_INFO_INFOBACKGROUND 24515 +#define IDC_RSCDISPLAYARSENAL_INFO_INFONAME 24516 +#define IDC_RSCDISPLAYARSENAL_INFO_INFOAUTHOR 24517 +#define IDC_RSCDISPLAYARSENAL_INFO_DLCBACKGROUND 24518 +#define IDC_RSCDISPLAYARSENAL_INFO_DLCICON 24715 +#define IDC_RSCDISPLAYARSENAL_INFO_INFO 25815 + +#define IDC_RSCDISPLAYARSENAL_STATS_STATSBACKGROUND 27347 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT1 27348 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT2 27349 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT3 27350 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT4 27351 +#define IDC_RSCDISPLAYARSENAL_STATS_STAT5 27352 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT1 27353 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT2 27354 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT3 27355 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT4 27356 +#define IDC_RSCDISPLAYARSENAL_STATS_STATTEXT5 27357 +#define IDC_RSCDISPLAYARSENAL_STATS_STATS 28644 + +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_CONTROLBAR 44046 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONSAVE 44146 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONLOAD 44147 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONEXPORT 44148 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONIMPORT 44149 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONRANDOM 44150 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONINTERFACE 44151 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONOK 44346 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONTRY 44347 +#define IDC_RSCDISPLAYARSENAL_CONTROLSBAR_BUTTONCLOSE 44448 + +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_TITLE 34619 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN1 34620 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_TEXTNAME 34621 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_MAINBACKGROUND 34622 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN2 34623 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN3 34624 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN4 34625 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_COLUMN5 34626 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_EDITNAME 35020 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_VALUENAME 35119 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_TEMPLATE 35919 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_BUTTONOK 36019 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_BUTTONCANCEL 36020 +#define IDC_RSCDISPLAYARSENAL_TEMPLATE_BUTTONDELETE 36021 + +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEARSENALBACKGROUND 26603 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEGARAGEBACKGROUND 26604 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEARSENAL 26803 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACEGARAGE 26804 +#define IDC_RSCDISPLAYARSENAL_SPACE_SPACE 27903 + +//--- RscDisplayGarage +#define IDC_RSCDISPLAYGARAGE_TAB_CAR 0 +#define IDC_RSCDISPLAYGARAGE_TAB_ARMOR 1 +#define IDC_RSCDISPLAYGARAGE_TAB_HELI 2 +#define IDC_RSCDISPLAYGARAGE_TAB_PLANE 3 +#define IDC_RSCDISPLAYGARAGE_TAB_NAVAL 4 +#define IDC_RSCDISPLAYGARAGE_TAB_STATIC 5 + +#define IDC_RSCDISPLAYGARAGE_TAB_SUBCREW 18 //--- Match he numbers with Arsenal right panel IDCs +#define IDC_RSCDISPLAYGARAGE_TAB_SUBANIMATION 19 +#define IDC_RSCDISPLAYGARAGE_TAB_SUBTEXTURE 20 + +#define IDC_RSCDISPLAYGARAGE3DEN_TAB_SUBANIMATION 0 +#define IDC_RSCDISPLAYGARAGE3DEN_TAB_SUBTEXTURE 1 + +//--- RscDisplayCreateJIRAIssue +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BACKGROUND 29997 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_SCREENSHOTPATHTITLE 29998 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_TITLE 30097 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONMISSION 30098 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONMAP 30099 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONOBJECT 30100 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONEMPTY 30101 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_SCREENSHOTPATH 30397 +#define IDC_RSCDISPLAYCREATEJIRAISSUE_BUTTONCANCEL 31697 + +//--- RscDisplayDLCContentBrowser - main display +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_TITLEBACKGROUND 37179 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MAINBACKGROUND 37180 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_TITLE 37099 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_PLAYERSNAME 37100 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONCANCEL 38799 //MUF - todo - was exported, but not added to config +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_LISTGROUP 38400 +//--- RscDisplayDLCContentBrowser - General +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWBACKGROUND 37101 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWTEXT 37102 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_TABSBACKGROUND 37106 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWDLCNAME 37137 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_OVERVIEWPICTURE 37299 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_GENERALGROUP 38399 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONASSETS 38499 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONSINGLEPLAYER 38500 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONMULTIPLAYER 38501 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONFEATURES 38502 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONPURCHASE 38503 +//--- RscDisplayDLCContentBrowser - item template +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMBACKGROUND 37129 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMBACKGROUNDBLACK 37130 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMNAME 37131 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMTEXTSESSIONTIME 37132 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMSESSIONTIME 37133 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMTEXTTOTALTIME 37134 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMTOTALTIME 37135 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMDESCRIPTION 37136 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMPICTURE 37300 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_ITEMPREMIUMICON 37311 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_RSCDISPLAYDLCCONTENTBROWSER_ITEMTEMPLATE 38401 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONTRY 38504 +//--- RscDisplayDLCContentBrowser - dlc selection group +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSPURCHASED 37103 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELIPURCHASED 37104 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENPURCHASED 37105 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSBACKGROUND 37108 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSNAME 37109 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELIBACKGROUND 37110 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELINAME 37111 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENBACKGROUND 37112 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENNAME 37113 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLEBACKGROUND 37114 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLENAME 37115 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSLOGO 37301 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELILOGO 37302 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENLOGO 37303 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLELOGO 37304 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_KARTSOVERLAY 37305 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_HELIOVERLAY 37306 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MARKSMENOVERLAY 37307 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUNDLEOVERLAY 37308 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLCSELECTIONGROUP 38402 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXBACKGROUND 37116 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXNAME 37117 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXPURCHASED 37118 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXLOGO 37309 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_APEXOVERLAY 37310 + + +//--- GroundSupport_ProcedureVisualization +#define IDC_GROUNDSUPPORT_PROCEDUREVISUALIZATION_PROGRESS 68374 +#define IDC_GROUNDSUPPORT_PROCEDUREVISUALIZATION_TEXT 68375 + +//--- RscDisplaySelectIsland +#define IDC_RSCDISPLAYSELECTISLAND_TITLE 24691 +#define IDC_RSCDISPLAYSELECTISLAND_NAME 24693 +#define IDC_RSCDISPLAYSELECTISLAND_AUTHOR 24694 +#define IDC_RSCDISPLAYSELECTISLAND_NAMEBACKGROUND 24695 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDPANORAMA 24891 +#define IDC_RSCDISPLAYSELECTISLAND_INTERLACING 24892 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD1 24893 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD2 24894 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD3 24895 +#define IDC_RSCDISPLAYSELECTISLAND_CLOUD4 24896 +#define IDC_RSCDISPLAYSELECTISLAND_ISLANDGROUP 25991 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE3D 26091 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE 26291 +#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCANCEL 26391 + +//--- RscDisplayPurchaseNotification +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_TITLE 46662 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_TEXT 46663 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_DLCLIST 46762 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_PNPICTURE 46862 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_PNCONTROLSGROUP 47962 +#define IDC_RSCDISPLAYPURCHASENOTIFICATION_BUTTONOK 48262 + +//--- RscDiary +#define IDC_TASKTOOLTIP 47060 +#define IDC_TASKTOOLTIP_BACKGROUND 47061 +#define IDC_TASKTOOLTIP_TITLE 47062 +#define IDC_TASKTOOLTIP_SUBTITLE 47063 +#define IDC_TASKTOOLTIP_BUTTON 47064 +#define IDC_TASKTOOLTIP_ASSIGNEDICON 47065 +#define IDC_TASKTOOLTIP_ASSIGNEDCOUNTER 47066 + +//--- RscRespawnControlsGroup +#define IDC_RSCRESPAWNCONTROLS_RESPAWNCONTROLSGROUP 88800 +#define IDC_RSCRESPAWNCONTROLS_LOCBACKGROUND 88802 +#define IDC_RSCRESPAWNCONTROLS_ROLEBACKGROUND 88803 +#define IDC_RSCRESPAWNCONTROLS_GEARBACKGROUND 88804 +#define IDC_RSCRESPAWNCONTROLS_HEADERBACKGROUND 88801 +#define IDC_RSCRESPAWNCONTROLS_BUTTONSPECTATE 88811 +#define IDC_RSCRESPAWNCONTROLS_LOCLIST 88808 +#define IDC_RSCRESPAWNCONTROLS_ROLELIST 88809 +#define IDC_RSCRESPAWNCONTROLS_COUNTERTEXT 88826 +#define IDC_RSCRESPAWNCONTROLS_COUNTER 88806 +#define IDC_RSCRESPAWNCONTROLS_AUTORESPAWN 88830 +#define IDC_RSCRESPAWNCONTROLS_TEAMTEXT 88827 +#define IDC_RSCRESPAWNCONTROLS_TEAM 88805 +#define IDC_RSCRESPAWNCONTROLS_TICKETSTEXT 88828 +#define IDC_RSCRESPAWNCONTROLS_TICKETS 88807 +#define IDC_RSCRESPAWNCONTROLS_HEADERRESPAWNBUTTON 88829 +#define IDC_RSCRESPAWNCONTROLS_WARNING 88831 +#define IDC_RSCRESPAWNCONTROLS_COMBOLOADOUT 88813 +#define IDC_RSCRESPAWNCONTROLS_BUTTONDETAILS 88814 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDPRIMARYWEAPON 88822 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDSECONDARYWEAPON 88823 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDOPTICS 88824 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDITEM 88825 +#define IDC_RSCRESPAWNCONTROLS_PICTUREPRIMARYWEAPON 88815 +#define IDC_RSCRESPAWNCONTROLS_PICTURESECONDARYWEAPON 88816 +#define IDC_RSCRESPAWNCONTROLS_PICTUREOPTICS 88817 +#define IDC_RSCRESPAWNCONTROLS_PICTUREITEM 88818 +#define IDC_RSCRESPAWNCONTROLS_LOCTITLE 88819 +#define IDC_RSCRESPAWNCONTROLS_ROLETITLE 88820 +#define IDC_RSCRESPAWNCONTROLS_GEARTITLE 88821 +#define IDC_RSCRESPAWNCONTROLS_LOCDISABLED 88832 +#define IDC_RSCRESPAWNCONTROLS_ROLEDISABLED 88833 +#define IDC_RSCRESPAWNCONTROLS_LOADOUTDISABLED 88834 + +#define IDC_RSCRESPAWNCONTROLS_RESPAWNDETAILSCONTROLSGROUP 88850 +#define IDC_RSCRESPAWNCONTROLS_BACKGROUNDDETAILS 88851 +#define IDC_RSCRESPAWNCONTROLS_DETAILSTITLE 88852 +#define IDC_RSCRESPAWNCONTROLS_BUTTONDETAILSCLOSE 88853 + +#define IDC_RSCRESPAWNCONTROLS_RESPAWNDETAILSLISTCONTROLSGROUP 88860 +#define IDC_RSCRESPAWNCONTROLS_DETAILSLIST 88861 + +#define IDC_RSCRESPAWNCONTROLS_OVERHEADERBACKGROUND 88870 +#define IDC_RSCRESPAWNCONTROLS_OVERHEADERLEFT 88871 +#define IDC_RSCRESPAWNCONTROLS_OVERHEADERRIGHT 88872 + +#define IDC_RSCRESPAWNCONTROLS_REVIVEINFO 88874 +#define IDC_RSCRESPAWNCONTROLS_REVIVEINFO_TITLE 88875 +#define IDC_RSCRESPAWNCONTROLS_REVIVEINFO_OPTION 88876 + +#define IDC_RSCRESPAWNCONTROLS_RESPAWNINFO 88877 +#define IDC_RSCRESPAWNCONTROLS_RESPAWNINFO_TITLE 88878 +#define IDC_RSCRESPAWNCONTROLS_RESPAWNINFO_OPTION 88879 + +//--- RscRevive +#define IDC_RSCREVIVE_REVIVEPROGRESSBACKGROUND 4817 +#define IDC_RSCREVIVE_REVIVEPROGRESS 4818 +#define IDC_RSCREVIVE_REVIVEKEYPROGRESS 4819 +#define IDC_RSCREVIVE_REVIVEBAR 4820 +#define IDC_RSCREVIVE_REVIVETEXT 4917 +#define IDC_RSCREVIVE_REVIVECOUNTDOWN 4918 +#define IDC_RSCREVIVE_REVIVEINFO 4919 +#define IDC_RSCREVIVE_REVIVEKEYBACKGROUND 4920 +#define IDC_RSCREVIVE_REVIVEKEY 4921 +#define IDC_RSCREVIVE_REVIVEMEDIKIT 5017 +#define IDC_RSCREVIVE_REVIVEMEDIKITPROGRESS 5018 +#define IDC_RSCREVIVE_REVIVEDEATH 5019 +#define IDC_RSCREVIVE_REVIVERESPAWN 6117 +#define IDC_RSCREVIVE_REVIVETEXT2 6118 + +//--- DynamicGroups +#define IDC_DYNAMICGROUPS_HEADER 9377 +#define IDC_DYNAMICGROUPS_BACKGROUNDMANAGE 9379 +#define IDC_DYNAMICGROUPS_TEXTPLAYERNAME 9380 +#define IDC_DYNAMICGROUPS_BACKGROUNDGROUPNAME 9381 +#define IDC_DYNAMICGROUPS_BACKGROUNDPLAYERS 9382 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSIDE 9383 +#define IDC_DYNAMICGROUPS_TEXTPLAYERCOUNT 9384 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSCORE 9386 +#define IDC_DYNAMICGROUPS_TEXTPLAYERNAMEFILL 9387 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSIDEFILL 9388 +#define IDC_DYNAMICGROUPS_TEXTPLAYERSCOREFILL 9389 +#define IDC_DYNAMICGROUPS_TEXTPRIVATE 9390 +#define IDC_DYNAMICGROUPS_GROUPICON 9577 +#define IDC_DYNAMICGROUPS_PICTURESIDE 9578 +#define IDC_DYNAMICGROUPS_EDITGROUPNAME 9777 +#define IDC_DYNAMICGROUPS_LISTBOXGROUPS 9877 +#define IDC_DYNAMICGROUPS_LISTBOXMANAGE 9878 +#define IDC_DYNAMICGROUPS_LISTBOXPLAYERS 9880 +#define IDC_DYNAMICGROUPS_BUTTONJOIN 9977 +#define IDC_DYNAMICGROUPS_BUTTONCREATELEAVEKICK 9978 +#define IDC_DYNAMICGROUPS_BUTTONPROMOTEDISBAND 9979 +#define IDC_DYNAMICGROUPS_BUTTONINVITE 9980 +#define IDC_DYNAMICGROUPS_TABBUTTONGROUPS 9981 +#define IDC_DYNAMICGROUPS_TABBUTTONPLAYERS 9983 +#define IDC_DYNAMICGROUPS_SECTIONMANAGE 10677 +#define IDC_DYNAMICGROUPS_SECTIONGROUPS 10679 +#define IDC_DYNAMICGROUPS_CHECKBOXPRIVATE 11177 + +//--- RscHvtPhase +#define IDC_RSCHVTPHASE_PERSISTENT 6610 +#define IDC_RSCHVTPHASE_DYNAMIC 6611 +#define IDC_RSCHVTPHASE_DOWNLOADTITLE 6612 +#define IDC_RSCHVTPHASE_DOWNLOADCONTENT 6613 +#define IDC_RSCHVTPHASE_MULTIPLIER 6614 +#define IDC_RSCHVTPHASE_RANGEBACKGROUND 6615 +#define IDC_RSCHVTPHASE_TIMER 6616 +#define IDC_RSCHVTPHASE_PROGRESSBAR 6620 +#define IDC_RSCHVTPHASE_DOWNLOADSPEED 6621 +#define IDC_RSCHVTPHASE_RANGE 6810 +#define IDC_RSCHVTPHASE_CARRIERPICTURE 6811 +#define IDC_RSCHVTPHASE_DOWNLOAD 7910 + +//--- RscPhaseRules +#define IDC_RSCPHASERULES_PHASE1NUMBER 9131 +#define IDC_RSCPHASERULES_PHASE1TEXT 9132 +#define IDC_RSCPHASERULES_PHASE2TEXT 9133 +#define IDC_RSCPHASERULES_PHASE2NUMBER 9134 +#define IDC_RSCPHASERULES_PHASE3TEXT 9135 +#define IDC_RSCPHASERULES_PHASE3NUMBER 9136 +#define IDC_RSCPHASERULES_PHASE1INFO 9137 +#define IDC_RSCPHASERULES_PHASE2INFO 9138 +#define IDC_RSCPHASERULES_PHASE3INFO 9139 +#define IDC_RSCPHASERULES_PHASERULES 10431 + +//--- RscDisplayEGSpectator +#define IDD_RSCDISPLAYEGSPECTATOR 60492 +#define IDC_RSCDISPLAYEGSPECTATOR_GAMETIMETEXT 42609 +#define IDC_RSCDISPLAYEGSPECTATOR_GAMEPHASETEXT 48610 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBBACKGROUND 42611 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEATASK 42612 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEABACKGROUND 42613 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBTASK 42614 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEACOLORBACKGROUND 42615 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBCOLORBACKGROUND 42616 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEACOLOR 42617 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBCOLOR 42618 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEAPROGRESSGROUP 48909 +#define IDC_RSCDISPLAYEGSPECTATOR_SIDEBPROGRESSGROUP 43910 +#define IDC_RSCDISPLAYEGSPECTATOR_MOUSEHANDLER 42989 +#define IDC_RSCDISPLAYEGSPECTATOR_TABS 43609 +#define IDC_RSCDISPLAYEGSPECTATOR_LIST 43109 +#define IDC_RSCDISPLAYEGSPECTATOR_LISTGROUP 43909 +#define IDC_RSCDISPLAYEGSPECTATOR_CAMERATYPESBACKGROUND 52610 +#define IDC_RSCDISPLAYEGSPECTATOR_FREE 52809 +#define IDC_RSCDISPLAYEGSPECTATOR_FOLLOW 52810 +#define IDC_RSCDISPLAYEGSPECTATOR_FPS 52811 +#define IDC_RSCDISPLAYEGSPECTATOR_CAMERATYPESGROUP 52909 +#define IDC_RSCDISPLAYEGSPECTATOR_MAP 62609 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPHEADER 62610 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPFOOTER 62611 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPTITLE 62612 +#define IDC_RSCDISPLAYEGSPECTATOR_SPECTATORSCOUNT 62613 +#define IDC_RSCDISPLAYEGSPECTATOR_SPECTATORSICON 62809 +#define IDC_RSCDISPLAYEGSPECTATOR_MAPGROUP 63909 +#define IDC_RSCDISPLAYEGSPECTATOR_HELPBACKGROUND 72812 +#define IDC_RSCDISPLAYEGSPECTATOR_HELP 73189 +#define IDC_RSCDISPLAYEGSPECTATOR_UPPERBACKGROUND 82609 +#define IDC_RSCDISPLAYEGSPECTATOR_NAME 82610 +#define IDC_RSCDISPLAYEGSPECTATOR_LOWERLEFTBACKGROUND 82611 +#define IDC_RSCDISPLAYEGSPECTATOR_LOWERRIGHTBACKGROUND 82612 +#define IDC_RSCDISPLAYEGSPECTATOR_AVATARBACKGROUND 82613 +#define IDC_RSCDISPLAYEGSPECTATOR_KILLS_COUNT 82614 +#define IDC_RSCDISPLAYEGSPECTATOR_LANDKILLS_COUNT 82615 +#define IDC_RSCDISPLAYEGSPECTATOR_ARMOREDKILLS_COUNT 82616 +#define IDC_RSCDISPLAYEGSPECTATOR_AIRKILLS_COUNT 82617 +#define IDC_RSCDISPLAYEGSPECTATOR_DEATHS_COUNT 82618 +#define IDC_RSCDISPLAYEGSPECTATOR_TOTAL_COUNT 82619 +#define IDC_RSCDISPLAYEGSPECTATOR_AVATAR 82809 +#define IDC_RSCDISPLAYEGSPECTATOR_UNITTYPE 82810 +#define IDC_RSCDISPLAYEGSPECTATOR_KILLS 82811 +#define IDC_RSCDISPLAYEGSPECTATOR_LANDKILLS 82812 +#define IDC_RSCDISPLAYEGSPECTATOR_ARMOREDKILLS 82813 +#define IDC_RSCDISPLAYEGSPECTATOR_AIRKILLS 82814 +#define IDC_RSCDISPLAYEGSPECTATOR_DEATHS 82815 +#define IDC_RSCDISPLAYEGSPECTATOR_TOTAL 82816 +#define IDC_RSCDISPLAYEGSPECTATOR_WEAPONPICTURE 82817 +#define IDC_RSCDISPLAYEGSPECTATOR_VEHICLETYPE 82818 +#define IDC_RSCDISPLAYEGSPECTATOR_FOCUSINFO 83909 + +//--- RscEGProgress +#define IDC_RSCEGPROGRESS_DOWNLOADICONBACKGROUND 9170 +#define IDC_RSCEGPROGRESS_OBJECTIVELETTER 9171 +#define IDC_RSCEGPROGRESS_ACTIVITYBACKGROUND 9172 +#define IDC_RSCEGPROGRESS_PROGRESSBARBACKGROUND 9173 +#define IDC_RSCEGPROGRESS_TITLE 9174 +#define IDC_RSCEGPROGRESS_PROGRESSBAR 9180 +#define IDC_RSCEGPROGRESS_OBJECTIVEBACKGROUND 9370 +#define IDC_RSCEGPROGRESS_ACTIVITY 9372 +#define IDC_RSCEGPROGRESS_DOWNLOADICON 9374 +#define IDC_RSCEGPROGRESS_OBJECTIVEBACKGROUNDCOLOURED 9375 +#define IDC_RSCEGPROGRESS_DOWNLOAD 9376 + +//--- RscDisplayQuickPlay +#define IDC_RSCDISPLAYQUICKPLAY_TITLE 18702 +#define IDC_RSCDISPLAYQUICKPLAY_PLAYERSNAME 18703 +#define IDC_RSCDISPLAYQUICKPLAY_MODTEXT 18704 +#define IDC_RSCDISPLAYQUICKPLAY_CONTENTBACKGROUND 18705 +#define IDC_RSCDISPLAYQUICKPLAY_MAXPINGTEXT 18706 +#define IDC_RSCDISPLAYQUICKPLAY_BESTMATCHTEXT 18707 +#define IDC_RSCDISPLAYQUICKPLAY_MODBACKGROUND 18708 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPEDESCRIPTION 18713 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPETITLEBACKGROUND 18714 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPETITLE 18715 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPEOVERVIEW 18903 +#define IDC_RSCDISPLAYQUICKPLAY_GAMETYPEDESCRIPTIONBACKGROUND 18904 +#define IDC_RSCDISPLAYQUICKPLAY_MODICON 18905 +#define IDC_RSCDISPLAYQUICKPLAY_CONTENT 20002 +#define IDC_RSCDISPLAYQUICKPLAY_BUTTONBACK 20402 + +//--- RscDisplayCampaignLobby (Scripted campaign lobby) +#define IDD_CAMPAIGN_LOBBY 50000 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_FULL_GROUP 51000 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_GROUP 51100 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_LOADING_GROUP 51200 +#define IDC_CAMPAIGN_LOBBY_BACKGROUND_BORDER_GROUP 51300 +#define IDC_CAMPAIGN_LOBBY_TABLET_GROUP 52000 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_GROUP 52100 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_SEARCH_GROUP 52200 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_SETTINGS_GROUP 52300 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_RESPAWN_GROUP 52400 +#define IDC_CAMPAIGN_LOBBY_TABLET_BUTTON_REVIVE_GROUP 52500 +#define IDC_CAMPAIGN_LOBBY_TABLET_MILITARY_GROUP 52600 +#define IDC_CAMPAIGN_LOBBY_MAIN_GROUP 53000 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_GROUP 53100 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_HEADER_GROUP 53200 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_STRUCTURE_GROUP 53300 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_OPTION_CORE_GROUP 53400 +#define IDC_CAMPAIGN_LOBBY_CTRG_TREE_OPTION_GROUP 53500 +#define IDC_CAMPAIGN_LOBBY_LOGIN_GROUP 54100 +#define IDC_CAMPAIGN_LOBBY_ACCESS_KEY_GROUP 54200 +#define IDC_CAMPAIGN_LOBBY_MISSION_GROUP 54300 +#define IDC_CAMPAIGN_LOBBY_MISSION_VIDEO_GROUP 54400 +#define IDC_CAMPAIGN_LOBBY_MISSION_INTEL_GROUP 54500 +#define IDC_CAMPAIGN_LOBBY_MISSION_OVERLAY_GROUP 54600 +#define IDC_CAMPAIGN_LOBBY_MISSION_PLAYER_CORE_GROUP 55000 +#define IDC_CAMPAIGN_LOBBY_MISSION_PLAYER_GROUP 55100 +#define IDC_CAMPAIGN_LOBBY_PROGRESS_GROUP 56000 +#define IDC_CAMPAIGN_LOBBY_OVERLAY_GROUP 57000 + +// RscDisplayDLCContentBrowser +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_PICTUREBACKGROUND 2000 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_PICTURE 2001 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_VIDEOGROUP 2002 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_VIDEO 2003 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_ICON 2004 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINEL 2005 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINER 2006 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINET 2007 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_LINEB 2008 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_BUTTON 2009 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_TITLE 2010 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLC_HOVER 2011 + +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_MOUSEAREA 999 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLCGROUP 1001 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_DLCBACKGROUND 1002 +#define IDC_RSCDISPLAYDLCCONTENTBROWSER_BUTTONBACKGROUND 1003 + +//--- RscDisplayDLCPreview_List +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BACKGROUND 31263 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFOTITLE 31264 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BACKGROUNDBOTTOM 31266 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFO 31363 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFOSTATS 31364 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIM 31463 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTURE 31464 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BROWSEPREV 31465 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BROWSENEXT 31466 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIMOVERLAY 31467 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREOVERLAY 31468 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIMOVERLAYICON 31469 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREOVERLAYICON 31470 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREBACKGROUND 31471 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREANIMBACKGROUND 31472 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTUREGROUP 32563 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_PICTURELISTGROUP 32564 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_INFOGROUP 32565 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BUTTONTRY 32663 +#define IDC_RSCDISPLAYDLCPREVIEW_LIST_BUTTONPURCHASE 32664 + +//--- RscDisplayDLCPreview_ListItem +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_SELECT 41883 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_HOVER 41884 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_PICTURE 42083 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_SESSIONNOTIFICATION 42084 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_BACKGROUND 42085 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_BUTTON 42483 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTITEM_RSCDISPLAYDLCPREVIEW_LISTITEM 43183 + +//--- RscDisplayDLCPreview +#define IDC_RSCDISPLAYDLCPREVIEW_BACKGROUND 1001 +#define IDC_RSCDISPLAYDLCPREVIEW_LOGO 1002 +#define IDC_RSCDISPLAYDLCPREVIEW_OVERVIEW 1003 +#define IDC_RSCDISPLAYDLCPREVIEW_PREVIEWGROUP 1004 +#define IDC_RSCDISPLAYDLCPREVIEW_PREVIEWBACKGROUND 1005 +#define IDC_RSCDISPLAYDLCPREVIEW_BUTTONBACKGROUND 1006 +#define IDC_RSCDISPLAYDLCPREVIEW_BUTTONPURCHASE 1007 +#define IDC_RSCDISPLAYDLCPREVIEW_AUTHOR 1008 +#define IDC_RSCDISPLAYDLCPREVIEW_LISTGROUP 1009 +#define IDC_RSCDISPLAYDLCPREVIEW_BOHEMIA 1010 + +//--- RscDisplayTimeline +#define IDD_RSCDISPLAYTIMELINE 15000 + +//--- RscDisplayTimeline +#define IDC_RSCDISPLAYTIMELINE_BACKGROUND 16985 +#define IDC_RSCDISPLAYTIMELINE_TEXTTIME 17085 +#define IDC_RSCDISPLAYTIMELINE_TEXTPLAYRATE 17086 +#define IDC_RSCDISPLAYTIMELINE_BUTTONPLAYFORWARD 17585 +#define IDC_RSCDISPLAYTIMELINE_BUTTONPLAYBACKWARD 17586 +#define IDC_RSCDISPLAYTIMELINE_BUTTONPAUSE 17587 +#define IDC_RSCDISPLAYTIMELINE_BUTTONDECREASEPLAYRATE 17588 +#define IDC_RSCDISPLAYTIMELINE_BUTTONINCREASEPLAYRATE 17589 +#define IDC_RSCDISPLAYTIMELINE_LIST 18085 +#define IDC_RSCDISPLAYTIMELINE_TIMELINECONTROLS 18285 diff --git a/mod.cpp b/mod.cpp index c775052e9..f29fc3c5b 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,8 +1,8 @@ -name = "Zeus Enhanced 1.14.0"; +name = "Zeus Enhanced 0.0.0"; picture = "logo_zen_ca.paa"; actionName = "GitHub"; action = "https://github.com/zen-mod/ZEN"; -description = "Zeus Enhanced - Version 1.14.0"; +description = "Zeus Enhanced - Version 0.0.0"; logo = "logo_zen_small_ca.paa"; logoOver = "logo_zen_small_ca.paa"; tooltip = "Zeus Enhanced"; diff --git a/sqfc.json b/sqfc.json index 2e1500e07..015be8fbf 100644 --- a/sqfc.json +++ b/sqfc.json @@ -6,9 +6,9 @@ "P:/" ], "excludeList": [ - "initsettings.sqf", - "initkeybinds.sqf", - "initattributes.sqf", + "initsettings.inc.sqf", + "initkeybinds.inc.sqf", + "initattributes.inc.sqf", "\\dev\\" ], "outputDir": "P:/",