From 56367217174efd6c37fca0e4daa89153b4da21ae Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 14 Jan 2015 07:24:17 +0100 Subject: [PATCH] try to port that vector --- TO_MERGE/agm/Vector/config.cpp | 353 ------------------ addons/ballistics/$PBOPREFIX$ | 2 +- addons/ballistics/CfgVehicles.hpp | 4 +- addons/vector/$PBOPREFIX$ | 1 + addons/vector/CfgEventHandlers.hpp | 12 + addons/vector/CfgVehicles.hpp | 26 ++ addons/vector/CfgWeapons.hpp | 16 + addons/vector/RscInGameUI.hpp | 165 ++++++++ .../vector/UI/ace_vector_x_ca.paa | Bin .../vector/XEH_postInit.sqf | 4 +- addons/vector/XEH_preInit.sqf | 21 ++ .../vector/ace_vector.p3d | Bin .../vector/ace_vector_optics.p3d | Bin addons/vector/config.cpp | 44 +++ .../vector/data/ace_default_as.paa | Bin .../vector/data/ace_vector.rvmat | 0 .../vector/data/ace_vector_co.paa | Bin .../vector/data/ace_vector_nohq.paa | Bin .../vector/data/ace_vector_smdi.paa | Bin .../data/reticles/ace_vector_reticle.paa | Bin .../vector/functions/fnc_abort.sqf | 1 + .../vector/functions/fnc_config.sqf | 1 + .../vector/functions/fnc_convertDegree.sqf | 1 + .../vector/functions/fnc_convertDistance.sqf | 1 + .../vector/functions/fnc_convertFOS.sqf | 1 + .../vector/functions/fnc_getDirection.sqf | 1 + .../vector/functions/fnc_getDistance.sqf | 1 + .../vector/functions/fnc_modeAzimuth.sqf | 1 + .../functions/fnc_modeAzimuthInclination.sqf | 1 + .../vector/functions/fnc_modeDistance.sqf | 1 + .../functions/fnc_modeDistanceAzimuth.sqf | 1 + .../functions/fnc_modeDistanceHeight.sqf | 1 + .../vector/functions/fnc_modeFallOfShort.sqf | 1 + .../fnc_modeRelativeAzimuthDistance.sqf | 1 + .../functions/fnc_modeRelativeDistance.sqf | 1 + .../fnc_modeRelativeDistanceHeight.sqf | 1 + .../vector/functions/fnc_settings.sqf | 1 + .../vector/functions/fnc_tabAzimuthKey.sqf | 1 + .../vector/functions/fnc_tabDistanceKey.sqf | 1 + addons/vector/functions/script_component.hpp | 1 + .../vector}/rsc/Vector_Center.paa | Bin .../vector}/rsc/Vector_Crosshair.paa | Bin .../agm/Vector => addons/vector}/rsc/d+.paa | Bin .../agm/Vector => addons/vector}/rsc/d-.paa | Bin .../agm/Vector => addons/vector}/rsc/d0.paa | Bin .../agm/Vector => addons/vector}/rsc/d1.paa | Bin .../agm/Vector => addons/vector}/rsc/d2.paa | Bin .../agm/Vector => addons/vector}/rsc/d3.paa | Bin .../agm/Vector => addons/vector}/rsc/d4.paa | Bin .../agm/Vector => addons/vector}/rsc/d5.paa | Bin .../agm/Vector => addons/vector}/rsc/d6.paa | Bin .../agm/Vector => addons/vector}/rsc/d7.paa | Bin .../agm/Vector => addons/vector}/rsc/d8.paa | Bin .../agm/Vector => addons/vector}/rsc/d9.paa | Bin .../agm/Vector => addons/vector}/rsc/dA.paa | Bin .../agm/Vector => addons/vector}/rsc/dC.paa | Bin .../agm/Vector => addons/vector}/rsc/dE.paa | Bin .../agm/Vector => addons/vector}/rsc/dF.paa | Bin .../agm/Vector => addons/vector}/rsc/dG.paa | Bin .../agm/Vector => addons/vector}/rsc/dL.paa | Bin .../agm/Vector => addons/vector}/rsc/dU.paa | Bin .../agm/Vector => addons/vector}/rsc/db.paa | Bin .../agm/Vector => addons/vector}/rsc/dd.paa | Bin .../vector}/rsc/debug_crosshair.paa | Bin .../agm/Vector => addons/vector}/rsc/di.paa | Bin .../agm/Vector => addons/vector}/rsc/dn.paa | Bin .../agm/Vector => addons/vector}/rsc/do.paa | Bin .../agm/Vector => addons/vector}/rsc/doo.paa | Bin .../agm/Vector => addons/vector}/rsc/dp.paa | Bin .../agm/Vector => addons/vector}/rsc/dq.paa | Bin .../agm/Vector => addons/vector}/rsc/dr.paa | Bin .../agm/Vector => addons/vector}/rsc/dt.paa | Bin addons/vector/script_component.hpp | 12 + .../Vector => addons/vector}/stringtable.xml | 10 +- extras/blank/functions/script_component.hpp | 2 +- 75 files changed, 328 insertions(+), 364 deletions(-) delete mode 100644 TO_MERGE/agm/Vector/config.cpp create mode 100644 addons/vector/$PBOPREFIX$ create mode 100644 addons/vector/CfgEventHandlers.hpp create mode 100644 addons/vector/CfgVehicles.hpp create mode 100644 addons/vector/CfgWeapons.hpp create mode 100644 addons/vector/RscInGameUI.hpp rename TO_MERGE/agm/Vector/UI/agm_vector_x_ca.paa => addons/vector/UI/ace_vector_x_ca.paa (100%) rename TO_MERGE/agm/Vector/clientInit.sqf => addons/vector/XEH_postInit.sqf (82%) create mode 100644 addons/vector/XEH_preInit.sqf rename TO_MERGE/agm/Vector/agm_vector.p3d => addons/vector/ace_vector.p3d (100%) rename TO_MERGE/agm/Vector/agm_vector_optics.p3d => addons/vector/ace_vector_optics.p3d (100%) create mode 100644 addons/vector/config.cpp rename TO_MERGE/agm/Vector/data/agm_default_as.paa => addons/vector/data/ace_default_as.paa (100%) rename TO_MERGE/agm/Vector/data/agm_vector.rvmat => addons/vector/data/ace_vector.rvmat (100%) rename TO_MERGE/agm/Vector/data/agm_vector_co.paa => addons/vector/data/ace_vector_co.paa (100%) rename TO_MERGE/agm/Vector/data/agm_vector_nohq.paa => addons/vector/data/ace_vector_nohq.paa (100%) rename TO_MERGE/agm/Vector/data/agm_vector_smdi.paa => addons/vector/data/ace_vector_smdi.paa (100%) rename TO_MERGE/agm/Vector/data/reticles/agm_vector_reticle.paa => addons/vector/data/reticles/ace_vector_reticle.paa (100%) rename TO_MERGE/agm/Vector/functions/fn_abort.sqf => addons/vector/functions/fnc_abort.sqf (97%) rename TO_MERGE/agm/Vector/functions/fn_config.sqf => addons/vector/functions/fnc_config.sqf (99%) rename TO_MERGE/agm/Vector/functions/fn_convertDegree.sqf => addons/vector/functions/fnc_convertDegree.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_convertDistance.sqf => addons/vector/functions/fnc_convertDistance.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_convertFOS.sqf => addons/vector/functions/fnc_convertFOS.sqf (99%) rename TO_MERGE/agm/Vector/functions/fn_getDirection.sqf => addons/vector/functions/fnc_getDirection.sqf (89%) rename TO_MERGE/agm/Vector/functions/fn_getDistance.sqf => addons/vector/functions/fnc_getDistance.sqf (95%) rename TO_MERGE/agm/Vector/functions/fn_modeAzimuth.sqf => addons/vector/functions/fnc_modeAzimuth.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_modeAzimuthInclination.sqf => addons/vector/functions/fnc_modeAzimuthInclination.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_modeDistance.sqf => addons/vector/functions/fnc_modeDistance.sqf (97%) rename TO_MERGE/agm/Vector/functions/fn_modeDistanceAzimuth.sqf => addons/vector/functions/fnc_modeDistanceAzimuth.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_modeDistanceHeight.sqf => addons/vector/functions/fnc_modeDistanceHeight.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_modeFallOfShort.sqf => addons/vector/functions/fnc_modeFallOfShort.sqf (99%) rename TO_MERGE/agm/Vector/functions/fn_modeRelativeAzimuthDistance.sqf => addons/vector/functions/fnc_modeRelativeAzimuthDistance.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_modeRelativeDistance.sqf => addons/vector/functions/fnc_modeRelativeDistance.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_modeRelativeDistanceHeight.sqf => addons/vector/functions/fnc_modeRelativeDistanceHeight.sqf (98%) rename TO_MERGE/agm/Vector/functions/fn_settings.sqf => addons/vector/functions/fnc_settings.sqf (99%) rename TO_MERGE/agm/Vector/functions/fn_tabAzimuthKey.sqf => addons/vector/functions/fnc_tabAzimuthKey.sqf (99%) rename TO_MERGE/agm/Vector/functions/fn_tabDistanceKey.sqf => addons/vector/functions/fnc_tabDistanceKey.sqf (99%) create mode 100644 addons/vector/functions/script_component.hpp rename {TO_MERGE/agm/Vector => addons/vector}/rsc/Vector_Center.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/Vector_Crosshair.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d+.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d-.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d0.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d1.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d2.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d3.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d4.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d5.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d6.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d7.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d8.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/d9.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dA.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dC.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dE.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dF.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dG.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dL.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dU.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/db.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dd.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/debug_crosshair.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/di.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dn.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/do.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/doo.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dp.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dq.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dr.paa (100%) rename {TO_MERGE/agm/Vector => addons/vector}/rsc/dt.paa (100%) create mode 100644 addons/vector/script_component.hpp rename {TO_MERGE/agm/Vector => addons/vector}/stringtable.xml (90%) diff --git a/TO_MERGE/agm/Vector/config.cpp b/TO_MERGE/agm/Vector/config.cpp deleted file mode 100644 index 85b05cafb3..0000000000 --- a/TO_MERGE/agm/Vector/config.cpp +++ /dev/null @@ -1,353 +0,0 @@ -class CfgPatches { - class AGM_Vector { - units[] = {"AGM_Item_Vector"}; - weapons[] = {"AGM_Vector"}; - requiredVersion = 0.1; - requiredAddons[] = {AGM_Core}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {"Ghost", "Hamburger SV", "commy2", "bux578"}; - authorUrl = "https://github.com/commy2/"; - }; -}; - -class CfgFunctions { - class AGM_Vector { - class AGM_Vector { - file = "AGM_Vector\functions"; - class abort; - class config; - class convertDegree; - class convertDistance; - class convertFOS; - class getDirection; - class getDistance; - class modeAzimuth; - class modeAzimuthInclination; - class modeDistance; - class modeDistanceAzimuth; - class modeDistanceHeight; - class modeFallOfShort; - class modeRelativeAzimuthDistance; - class modeRelativeDistance; - class modeRelativeDistanceHeight; - class settings; - class tabAzimuthKey; - class tabDistanceKey; - }; - }; -}; - -class Extended_PostInit_EventHandlers { - class AGM_Vector { - clientInit = "call compile preprocessFileLineNumbers '\AGM_Vector\clientInit.sqf'"; - }; -}; - -class AGM_Core_Default_Keys { - class vectorAzimuth { - displayName = "$STR_AGM_Vector_AzimuthKey"; - condition = "currentWeapon player == 'AGM_Vector' && {_vehicle == player} && {cameraView == 'Gunner'}"; - statement = "AGM_vectorKey set [0, true]; if (AGM_isVectorReady) then {AGM_isVectorReady = false; AGM_Vector_scriptHandle = 0 spawn AGM_Vector_fnc_tabAzimuthKey; 0 spawn AGM_Vector_fnc_abort;};"; - conditionUp = "true"; - statementUp = "AGM_vectorKey set [0, false];"; - key = 15; - shift = 0; - control = 0; - alt = 0; - }; - class vectorDistance { - displayName = "$STR_AGM_Vector_DistanceKey"; - condition = "currentWeapon player == 'AGM_Vector' && {_vehicle == player} && {cameraView == 'Gunner'}"; - statement = "AGM_vectorKey set [1, true]; if (AGM_isVectorReady) then {AGM_isVectorReady = false; AGM_Vector_scriptHandle = 0 spawn AGM_Vector_fnc_tabDistanceKey; 0 spawn AGM_Vector_fnc_abort;};"; - conditionUp = "true"; - statementUp = "AGM_vectorKey set [1, false];"; - key = 19; - shift = 0; - control = 0; - alt = 0; - }; -}; - -class CfgWeapons { - class Binocular; - class AGM_Vector: Binocular { - author = "$STR_AGM_Core_AGMTeam"; - displayName = "$STR_AGM_Vector_VectorName"; - descriptionShort = "$STR_AGM_Vector_VectorDescription"; - model = "\AGM_Vector\agm_vector.p3d"; - modelOptics = "\AGM_Vector\agm_vector_optics.p3d"; - picture = "\AGM_Vector\UI\agm_vector_x_ca.paa"; - visionMode[] = {"Normal","NVG"}; - opticsZoomMax = 0.03; - opticsZoomMin = 0.03; - weaponInfoType = "AGM_RscOptics_vector"; - }; -}; - -class CfgVehicles { - class Item_Base_F; - class AGM_Item_Vector: Item_Base_F { - author = "Ghost, Hamburger SV"; - scope = 2; - scopeCurator = 2; - displayName = "$STR_AGM_Vector_VectorName"; - vehicleClass = "Items"; - class TransportWeapons { - class AGM_Vector { - weapon = "AGM_Vector"; - count = 1; - }; - }; - }; - - class Box_NATO_Support_F; - class AGM_Box_Misc: Box_NATO_Support_F { - class TransportWeapons { - class _xx_AGM_Vector { - weapon = "AGM_Vector"; - count = 6; - }; - }; - }; -}; - -class AGM_Rsc_Display_Base; -class AGM_Rsc_Control_Base; -class RSCText; - -class RscInGameUI { - class AGM_RscOptics_vector: AGM_Rsc_Display_Base { - idd = -1; - onLoad = "uiNamespace setVariable ['AGM_dlgVectorOptics', _this select 0];"; - controls[] = {"CA_Distance","CA_Heading","CA_OpticsPitch"}; - - class CA_Distance: RSCText { - idc = 151; // distance - w = 0; - h = 0; - }; - class CA_Heading: RSCText { - idc = 156; // azimuth - w = 0; - h = 0; - }; - class CA_OpticsPitch: RSCText { - idc = 182; // inclination - w = 0; - h = 0; - }; - }; -}; - -class RscTitles { - class AGM_Vector : AGM_Rsc_Display_Base { - name = "AGM_Vector"; - onLoad = "uiNamespace setVariable ['AGM_dlgVector', _this select 0];"; - controls[] = {"Vector_Center", "Vector_Crosshair", "Digit0", "Digit1", "Digit2", "Digit3", "Digit4", "Digit5", "Digit6", "Digit7", "Digit8", "Digit9", "DigitE1", "DigitE2", "DigitE3", "DigitE4"}; - - class Vector_Center : AGM_Rsc_Control_Base { - idc = 1; - colorText[] = {1, 0, 0, 0.5}; - x = 0.488 * safezoneW + safezoneX; - y = 0.4783 * safezoneH + safezoneY; - w = 0.4 / 16 * safezoneW; - h = 0.4 / 9 * safezoneH; - }; - - class Vector_Crosshair : Vector_Center { - idc = 2; - x = 0.4848 * safezoneW + safezoneX; - y = 0.4732 * safezoneH + safezoneY; - w = 0.5 / 16 * safezoneW; - h = 0.5 / 9 * safezoneH; - }; - - class Digit0 : Vector_Center { - idc = 10; - x = (0.54 + 0 * 0.02) * safezoneW + safezoneX; - y = 0.54 * safezoneH + safezoneY; - w = 0.5 / 16 * safezoneW; - h = 0.5 / 9 * safezoneH; - }; - - class Digit1 : Digit0 { - idc = 11; - x = (0.54 + 1 * 0.02) * safezoneW + safezoneX; - }; - - class Digit2 : Digit0 { - idc = 12; - x = (0.54 + 2 * 0.02) * safezoneW + safezoneX; - }; - - class Digit3 : Digit0 { - idc = 13; - x = (0.54 + 3 * 0.02) * safezoneW + safezoneX; - }; - - class Digit4 : Digit0 { - idc = 14; - x = (0.54 + 4 * 0.02) * safezoneW + safezoneX; - }; - - class Digit5 : Digit0 { - idc = 15; - x = (0.35 + 0 * 0.02) * safezoneW + safezoneX; - }; - - class Digit6 : Digit0 { - idc = 16; - x = (0.35 + 1 * 0.02) * safezoneW + safezoneX; - }; - - class Digit7 : Digit0 { - idc = 17; - x = (0.35 + 2 * 0.02) * safezoneW + safezoneX; - }; - - class Digit8 : Digit0 { - idc = 18; - x = (0.35 + 3 * 0.02) * safezoneW + safezoneX; - }; - - class Digit9 : Digit0 { - idc = 19; - x = (0.35 + 4 * 0.02) * safezoneW + safezoneX; - }; - - class DigitE1 : Digit0 { - idc = 21; - x = (0.39 + 0 * 0.02) * safezoneW + safezoneX; - y = 0.42 * safezoneH + safezoneY; - }; - - class DigitE2 : DigitE1 { - idc = 22; - x = (0.39 + 1 * 0.02) * safezoneW + safezoneX; - }; - - class DigitE3 : DigitE1 { - idc = 23; - x = (0.39 + 2 * 0.02) * safezoneW + safezoneX; - }; - - class DigitE4 : DigitE1 { - idc = 24; - x = (0.39 + 3 * 0.02) * safezoneW + safezoneX; - }; - }; - - //PRELOAD - class AGM_Digit_Preload : AGM_Rsc_Display_Base { - class controlsBackground { - class Preload_Center : AGM_Rsc_Control_Base { - text = "\AGM_Vector\rsc\Vector_Center.paa"; - }; - class Preload_0 : Preload_Center { - text = "\AGM_Vector\rsc\d0.paa"; - }; - class Preload_1 : Preload_Center { - text = "\AGM_Vector\rsc\d1.paa"; - }; - class Preload_2 : Preload_Center { - text = "\AGM_Vector\rsc\d2.paa"; - }; - class Preload_3 : Preload_Center { - text = "\AGM_Vector\rsc\d3.paa"; - }; - class Preload_4 : Preload_Center { - text = "\AGM_Vector\rsc\d4.paa"; - }; - class Preload_5 : Preload_Center { - text = "\AGM_Vector\rsc\d5.paa"; - }; - class Preload_6 : Preload_Center { - text = "\AGM_Vector\rsc\d6.paa"; - }; - class Preload_7 : Preload_Center { - text = "\AGM_Vector\rsc\d7.paa"; - }; - class Preload_8 : Preload_Center { - text = "\AGM_Vector\rsc\d8.paa"; - }; - class Preload_9 : Preload_Center { - text = "\AGM_Vector\rsc\d9.paa"; - }; - class Preload_x : Preload_Center { - text = "\AGM_Vector\rsc\d+.paa"; - }; - class Preload_y : Preload_Center { - text = "\AGM_Vector\rsc\d-.paa"; - }; - class Preload_A : Preload_Center { - text = "\AGM_Vector\rsc\dA.paa"; - }; - class Preload_b : Preload_Center { - text = "\AGM_Vector\rsc\db.paa"; - }; - class Preload_C : Preload_Center { - text = "\AGM_Vector\rsc\dC.paa"; - }; - class Preload_d : Preload_Center { - text = "\AGM_Vector\rsc\dd.paa"; - }; - class Preload_E : Preload_Center { - text = "\AGM_Vector\rsc\dE.paa"; - }; - class Preload_F : Preload_Center { - text = "\AGM_Vector\rsc\dF.paa"; - }; - class Preload_G : Preload_Center { - text = "\AGM_Vector\rsc\dG.paa"; - }; - class Preload_i : Preload_Center { - text = "\AGM_Vector\rsc\di.paa"; - }; - class Preload_L : Preload_Center { - text = "\AGM_Vector\rsc\dL.paa"; - }; - class Preload_n : Preload_Center { - text = "\AGM_Vector\rsc\dn.paa"; - }; - class Preload_o : Preload_Center { - text = "\AGM_Vector\rsc\do.paa"; - }; - class Preload_oo : Preload_Center { - text = "\AGM_Vector\rsc\doo.paa"; - }; - class Preload_P : Preload_Center { - text = "\AGM_Vector\rsc\dP.paa"; - }; - class Preload_q : Preload_Center { - text = "\AGM_Vector\rsc\dq.paa"; - }; - class Preload_r : Preload_Center { - text = "\AGM_Vector\rsc\dr.paa"; - }; - class Preload_t : Preload_Center { - text = "\AGM_Vector\rsc\dt.paa"; - }; - class Preload_U : Preload_Center { - text = "\AGM_Vector\rsc\dU.paa"; - }; - }; - }; - - class AGM_Debug_Crosshair : AGM_Rsc_Display_Base { - name = "AGM_Debug_Crosshair"; - onLoad = "uiNamespace setVariable ['AGM_ctrlDebugCrosshair', (_this select 0) displayCtrl 1];"; - - class controlsBackground { - class Debug_Crosshair : AGM_Rsc_Control_Base { - text = "\AGM_Vector\rsc\debug_crosshair.paa"; - colorText[] = {1, 0, 0, 0.5}; - x = 0.490938 * safezoneW + safezoneX; - y = 0.4838 * safezoneH + safezoneY; - w = 0.3 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - }; - }; -}; diff --git a/addons/ballistics/$PBOPREFIX$ b/addons/ballistics/$PBOPREFIX$ index 39789fcaba..cd74af42f1 100644 --- a/addons/ballistics/$PBOPREFIX$ +++ b/addons/ballistics/$PBOPREFIX$ @@ -1 +1 @@ -z\ace\addons\blank \ No newline at end of file +z\ace\addons\ballistics \ No newline at end of file diff --git a/addons/ballistics/CfgVehicles.hpp b/addons/ballistics/CfgVehicles.hpp index 5401236ce5..cdc73dcd99 100644 --- a/addons/ballistics/CfgVehicles.hpp +++ b/addons/ballistics/CfgVehicles.hpp @@ -2,12 +2,12 @@ #define MACRO_ADDMAGAZINE(MAGAZINE,COUNT) class _xx_##MAGAZINE { \ magazine = #MAGAZINE; \ count = COUNT; \ -}; +} #define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \ name = #ITEM; \ count = COUNT; \ -}; +} class CfgVehicles { #include diff --git a/addons/vector/$PBOPREFIX$ b/addons/vector/$PBOPREFIX$ new file mode 100644 index 0000000000..3d48af1374 --- /dev/null +++ b/addons/vector/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\vector \ No newline at end of file diff --git a/addons/vector/CfgEventHandlers.hpp b/addons/vector/CfgEventHandlers.hpp new file mode 100644 index 0000000000..0cd959a047 --- /dev/null +++ b/addons/vector/CfgEventHandlers.hpp @@ -0,0 +1,12 @@ + +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_preInit)); + }; +}; + +class Extended_PostInit_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_postInit)); + }; +}; diff --git a/addons/vector/CfgVehicles.hpp b/addons/vector/CfgVehicles.hpp new file mode 100644 index 0000000000..1305e73f88 --- /dev/null +++ b/addons/vector/CfgVehicles.hpp @@ -0,0 +1,26 @@ + +#define MACRO_ADDWEAPON(WEAPON,COUNT) class _xx_##WEAPON { \ + weapon = #WEAPON; \ + count = COUNT; \ +} + +class CfgVehicles { + class Item_Base_F; + class ACE_Item_Vector: Item_Base_F { + author = "$STR_ACE_Common_ACETeam"; + scope = 2; + scopeCurator = 2; + displayName = "$STR_ACE_Vector_VectorName"; + vehicleClass = "Items"; + class TransportWeapons { + MACRO_ADDWEAPON(ACE_Vector,1); + }; + }; + + class Box_NATO_Support_F; + class ACE_Box_Misc: Box_NATO_Support_F { + class TransportWeapons { + MACRO_ADDWEAPON(ACE_Vector,6); + }; + }; +}; diff --git a/addons/vector/CfgWeapons.hpp b/addons/vector/CfgWeapons.hpp new file mode 100644 index 0000000000..eea552a94b --- /dev/null +++ b/addons/vector/CfgWeapons.hpp @@ -0,0 +1,16 @@ + +class CfgWeapons { + class Binocular; + class ACE_Vector: Binocular { + author = "$STR_ACE_Common_ACETeam"; + displayName = "$STR_ACE_Vector_VectorName"; + descriptionShort = "$STR_ACE_Vector_VectorDescription"; + model = PATHTOF(ace_vector.p3d); + modelOptics = PATHTOF(ace_vector_optics.p3d); + picture = PATHTOF(UI\ace_vector_x_ca.paa); + visionMode[] = {"Normal","NVG"}; + opticsZoomMax = 0.03; + opticsZoomMin = 0.03; + weaponInfoType = "ACE_RscOptics_vector"; + }; +}; diff --git a/addons/vector/RscInGameUI.hpp b/addons/vector/RscInGameUI.hpp new file mode 100644 index 0000000000..0a2398b179 --- /dev/null +++ b/addons/vector/RscInGameUI.hpp @@ -0,0 +1,165 @@ + +class RscText; +class RscPicture; + +//class ScrollBar; +class RscControlsGroup { + class VScrollbar;//: ScrollBar {}; + class HScrollbar;//: ScrollBar {}; +}; + +class RscInGameUI { + class RscUnitInfo; + class ACE_RscOptics_vector: RscUnitInfo { + onLoad = "[""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable ['ACE_dlgVectorOptics', _this select 0];"; + onUnload = "[""onUnload"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + idd = 300; + controls[] = {"CA_Distance","CA_Heading","CA_OpticsPitch","CA_Elev","CA_OpticsZoom","CA_VisionMode","ACE_ScriptedDisplayControlsGroup"}; + + class CA_Distance: RscText { + idc = 151; // distance + w = 0; + h = 0; + }; + + class CA_Heading: RscText { + idc = 156; // azimuth + w = 0; + h = 0; + }; + + class CA_OpticsPitch: RscText { + idc = 182; // inclination + w = 0; + h = 0; + }; + + class CA_Elev: RscText { + idc = 175; // inclination, more accurate + w = 0; + h = 0; + }; + + class CA_OpticsZoom: RscText { + idc = 180; // some kind of zoom + w = 0; + h = 0; + }; + + class CA_VisionMode: RscText { + idc = 179; // ??? + w = 0; + h = 0; + }; + + class ACE_ScriptedDisplayControlsGroup: RscControlsGroup { + idc = 170; + x = "SafezoneX"; + y = "SafezoneY"; + w = "SafezoneW"; + h = "SafezoneH"; + + class VScrollbar: VScrollbar { + width = 0; + }; + + class HScrollbar: HScrollbar { + height = 0; + }; + + class controls { + class Center: RscPicture { + idc = 1301; + text = ""; + colorText[] = {1,0,0,0.5}; + x = 0.488 * safezoneW /*+ safezoneX*/; + y = 0.4783 * safezoneH /*+ safezoneY*/; + w = 0.4 / 16 * safezoneW; + h = 0.4 / 9 * safezoneH; + }; + + class Crosshair: Center { + idc = 1302; + x = 0.4848 * safezoneW /*+ safezoneX*/; + y = 0.4732 * safezoneH /*+ safezoneY*/; + w = 0.5 / 16 * safezoneW; + h = 0.5 / 9 * safezoneH; + }; + + class Digit0: Center { + idc = 1310; + x = (0.54 + 0 * 0.02) * safezoneW /*+ safezoneX*/; + y = 0.54 * safezoneH /*+ safezoneY*/; + w = 0.5 / 16 * safezoneW; + h = 0.5 / 9 * safezoneH; + }; + + class Digit1: Digit0 { + idc = 1311; + x = (0.54 + 1 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit2: Digit0 { + idc = 1312; + x = (0.54 + 2 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit3: Digit0 { + idc = 1313; + x = (0.54 + 3 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit4: Digit0 { + idc = 1314; + x = (0.54 + 4 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit5: Digit0 { + idc = 1315; + x = (0.35 + 0 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit6: Digit0 { + idc = 1316; + x = (0.35 + 1 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit7: Digit0 { + idc = 1317; + x = (0.35 + 2 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit8: Digit0 { + idc = 1318; + x = (0.35 + 3 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class Digit9: Digit0 { + idc = 1319; + x = (0.35 + 4 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class DigitE1: Digit0 { + idc = 1321; + x = (0.39 + 0 * 0.02) * safezoneW /*+ safezoneX*/; + y = 0.42 * safezoneH /*+ safezoneY*/; + }; + + class DigitE2: DigitE1 { + idc = 1322; + x = (0.39 + 1 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class DigitE3: DigitE1 { + idc = 1323; + x = (0.39 + 2 * 0.02) * safezoneW /*+ safezoneX*/; + }; + + class DigitE4: DigitE1 { + idc = 1324; + x = (0.39 + 3 * 0.02) * safezoneW /*+ safezoneX*/; + }; + }; + }; + }; +}; diff --git a/TO_MERGE/agm/Vector/UI/agm_vector_x_ca.paa b/addons/vector/UI/ace_vector_x_ca.paa similarity index 100% rename from TO_MERGE/agm/Vector/UI/agm_vector_x_ca.paa rename to addons/vector/UI/ace_vector_x_ca.paa diff --git a/TO_MERGE/agm/Vector/clientInit.sqf b/addons/vector/XEH_postInit.sqf similarity index 82% rename from TO_MERGE/agm/Vector/clientInit.sqf rename to addons/vector/XEH_postInit.sqf index c1d6f6cdeb..c3574c3ae0 100644 --- a/TO_MERGE/agm/Vector/clientInit.sqf +++ b/addons/vector/XEH_postInit.sqf @@ -1,6 +1,6 @@ // by commy2 -player setVariable ["AGM_cooldownVector", 0, false]; +/*player setVariable ["AGM_cooldownVector", 0, false]; AGM_isVectorReady = true; AGM_vectorKey = [false, false]; @@ -10,4 +10,4 @@ AGM_vectorSettings = [false, false, false, false]; 0 spawn { waitUntil {preloadTitleRsc ["AGM_Digit_Preload", "PLAIN"]}; waitUntil {preloadTitleRsc ["AGM_Debug_Crosshair", "PLAIN"]}; -}; +};*/ diff --git a/addons/vector/XEH_preInit.sqf b/addons/vector/XEH_preInit.sqf new file mode 100644 index 0000000000..9656fd6e5a --- /dev/null +++ b/addons/vector/XEH_preInit.sqf @@ -0,0 +1,21 @@ +#include "script_component.hpp" + +PREP(abort); +PREP(config); +PREP(convertDegree); +PREP(convertDistance); +PREP(convertFOS); +PREP(getDirection); +PREP(getDistance); +PREP(modeAzimuth); +PREP(modeAzimuthInclination); +PREP(modeDistance); +PREP(modeDistanceAzimuth); +PREP(modeDistanceHeight); +PREP(modeFallOfShort); +PREP(modeRelativeAzimuthDistance); +PREP(modeRelativeDistance); +PREP(modeRelativeDistanceHeight); +PREP(settings); +PREP(tabAzimuthKey); +PREP(tabDistanceKey); diff --git a/TO_MERGE/agm/Vector/agm_vector.p3d b/addons/vector/ace_vector.p3d similarity index 100% rename from TO_MERGE/agm/Vector/agm_vector.p3d rename to addons/vector/ace_vector.p3d diff --git a/TO_MERGE/agm/Vector/agm_vector_optics.p3d b/addons/vector/ace_vector_optics.p3d similarity index 100% rename from TO_MERGE/agm/Vector/agm_vector_optics.p3d rename to addons/vector/ace_vector_optics.p3d diff --git a/addons/vector/config.cpp b/addons/vector/config.cpp new file mode 100644 index 0000000000..798d7ce7de --- /dev/null +++ b/addons/vector/config.cpp @@ -0,0 +1,44 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {"AGM_Item_Vector"}; + weapons[] = {"AGM_Vector"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author[] = {"Ghost","Hamburger SV","commy2","bux578"}; + authorUrl = "https://github.com/commy2/"; + VERSION_CONFIG; + }; +}; + +#include "CfgEventHandlers.hpp" +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" + +/*class AGM_Default_Keys { + class vectorAzimuth { + displayName = "$STR_AGM_Vector_AzimuthKey"; + condition = "currentWeapon player == 'AGM_Vector' && {_vehicle == player} && {cameraView == 'Gunner'}"; + statement = "AGM_vectorKey set [0, true]; if (AGM_isVectorReady) then {AGM_isVectorReady = false; AGM_Vector_scriptHandle = 0 spawn AGM_Vector_fnc_tabAzimuthKey; 0 spawn AGM_Vector_fnc_abort;};"; + conditionUp = "true"; + statementUp = "AGM_vectorKey set [0, false];"; + key = 15; + shift = 0; + control = 0; + alt = 0; + }; + class vectorDistance { + displayName = "$STR_AGM_Vector_DistanceKey"; + condition = "currentWeapon player == 'AGM_Vector' && {_vehicle == player} && {cameraView == 'Gunner'}"; + statement = "AGM_vectorKey set [1, true]; if (AGM_isVectorReady) then {AGM_isVectorReady = false; AGM_Vector_scriptHandle = 0 spawn AGM_Vector_fnc_tabDistanceKey; 0 spawn AGM_Vector_fnc_abort;};"; + conditionUp = "true"; + statementUp = "AGM_vectorKey set [1, false];"; + key = 19; + shift = 0; + control = 0; + alt = 0; + }; +};*/ + +#include "RscInGameUI.hpp" diff --git a/TO_MERGE/agm/Vector/data/agm_default_as.paa b/addons/vector/data/ace_default_as.paa similarity index 100% rename from TO_MERGE/agm/Vector/data/agm_default_as.paa rename to addons/vector/data/ace_default_as.paa diff --git a/TO_MERGE/agm/Vector/data/agm_vector.rvmat b/addons/vector/data/ace_vector.rvmat similarity index 100% rename from TO_MERGE/agm/Vector/data/agm_vector.rvmat rename to addons/vector/data/ace_vector.rvmat diff --git a/TO_MERGE/agm/Vector/data/agm_vector_co.paa b/addons/vector/data/ace_vector_co.paa similarity index 100% rename from TO_MERGE/agm/Vector/data/agm_vector_co.paa rename to addons/vector/data/ace_vector_co.paa diff --git a/TO_MERGE/agm/Vector/data/agm_vector_nohq.paa b/addons/vector/data/ace_vector_nohq.paa similarity index 100% rename from TO_MERGE/agm/Vector/data/agm_vector_nohq.paa rename to addons/vector/data/ace_vector_nohq.paa diff --git a/TO_MERGE/agm/Vector/data/agm_vector_smdi.paa b/addons/vector/data/ace_vector_smdi.paa similarity index 100% rename from TO_MERGE/agm/Vector/data/agm_vector_smdi.paa rename to addons/vector/data/ace_vector_smdi.paa diff --git a/TO_MERGE/agm/Vector/data/reticles/agm_vector_reticle.paa b/addons/vector/data/reticles/ace_vector_reticle.paa similarity index 100% rename from TO_MERGE/agm/Vector/data/reticles/agm_vector_reticle.paa rename to addons/vector/data/reticles/ace_vector_reticle.paa diff --git a/TO_MERGE/agm/Vector/functions/fn_abort.sqf b/addons/vector/functions/fnc_abort.sqf similarity index 97% rename from TO_MERGE/agm/Vector/functions/fn_abort.sqf rename to addons/vector/functions/fnc_abort.sqf index 240b2c735e..e309745c6f 100644 --- a/TO_MERGE/agm/Vector/functions/fn_abort.sqf +++ b/addons/vector/functions/fnc_abort.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlVectorCrosshair", "_ctrlDigit0", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigit9", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_ctrlDigitE4", "_allControls"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_config.sqf b/addons/vector/functions/fnc_config.sqf similarity index 99% rename from TO_MERGE/agm/Vector/functions/fn_config.sqf rename to addons/vector/functions/fnc_config.sqf index 89f58c919c..daaa39ff26 100644 --- a/TO_MERGE/agm/Vector/functions/fn_config.sqf +++ b/addons/vector/functions/fnc_config.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlVectorCrosshair", "_ctrlDigit0", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigit9", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_ctrlDigitE4", "_allControls", "_isReticle", "_isNVG", "_time", "_theCount"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_convertDegree.sqf b/addons/vector/functions/fnc_convertDegree.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_convertDegree.sqf rename to addons/vector/functions/fnc_convertDegree.sqf index 5a63cb1041..894541c2da 100644 --- a/TO_MERGE/agm/Vector/functions/fn_convertDegree.sqf +++ b/addons/vector/functions/fnc_convertDegree.sqf @@ -4,6 +4,7 @@ this code is property of the ArmA 3 Bundeswehr modification ask us nicely at http://www.bwmod.de/ if you want to re-use any of this script we don't support changed code based on this work */ +#include "script_component.hpp" private["_number", "_return", "_isNegative", "_digit1", "_digit2", "_digit3", "_digit4"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_convertDistance.sqf b/addons/vector/functions/fnc_convertDistance.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_convertDistance.sqf rename to addons/vector/functions/fnc_convertDistance.sqf index fb9b1618e6..e595d9a1cc 100644 --- a/TO_MERGE/agm/Vector/functions/fn_convertDistance.sqf +++ b/addons/vector/functions/fnc_convertDistance.sqf @@ -4,6 +4,7 @@ this code is property of the ArmA 3 Bundeswehr modification ask us nicely at http://www.bwmod.de/ if you want to re-use any of this script we don't support changed code based on this work */ +#include "script_component.hpp" private["_number", "_isNegative", "_digit1", "_digit2", "_digit3", "_digit4"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_convertFOS.sqf b/addons/vector/functions/fnc_convertFOS.sqf similarity index 99% rename from TO_MERGE/agm/Vector/functions/fn_convertFOS.sqf rename to addons/vector/functions/fnc_convertFOS.sqf index cb200f7580..004bc52218 100644 --- a/TO_MERGE/agm/Vector/functions/fn_convertFOS.sqf +++ b/addons/vector/functions/fnc_convertFOS.sqf @@ -4,6 +4,7 @@ this code is property of the ArmA 3 Bundeswehr modification ask us nicely at http://www.bwmod.de/ if you want to re-use any of this script we don't support changed code based on this work */ +#include "script_component.hpp" private["_number", "_coordinate", "_isNegative", "_digit0", "_digit1", "_digit2", "_digit3", "_digit4"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_getDirection.sqf b/addons/vector/functions/fnc_getDirection.sqf similarity index 89% rename from TO_MERGE/agm/Vector/functions/fn_getDirection.sqf rename to addons/vector/functions/fnc_getDirection.sqf index 84a6516eae..7d50bb411f 100644 --- a/TO_MERGE/agm/Vector/functions/fn_getDirection.sqf +++ b/addons/vector/functions/fnc_getDirection.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private "_dlgVectorOptics"; diff --git a/TO_MERGE/agm/Vector/functions/fn_getDistance.sqf b/addons/vector/functions/fnc_getDistance.sqf similarity index 95% rename from TO_MERGE/agm/Vector/functions/fn_getDistance.sqf rename to addons/vector/functions/fnc_getDistance.sqf index 70d0c78b03..40a5a9a362 100644 --- a/TO_MERGE/agm/Vector/functions/fn_getDistance.sqf +++ b/addons/vector/functions/fnc_getDistance.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" #define MIN_DISTANCE 10 #define MAX_DISTANCE ([6000, 9000] select (AGM_vectorSettings select 3)) diff --git a/TO_MERGE/agm/Vector/functions/fn_modeAzimuth.sqf b/addons/vector/functions/fnc_modeAzimuth.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeAzimuth.sqf rename to addons/vector/functions/fnc_modeAzimuth.sqf index 8afe487453..7a6ab71497 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeAzimuth.sqf +++ b/addons/vector/functions/fnc_modeAzimuth.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_exit", "_time"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeAzimuthInclination.sqf b/addons/vector/functions/fnc_modeAzimuthInclination.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeAzimuthInclination.sqf rename to addons/vector/functions/fnc_modeAzimuthInclination.sqf index 5b3e91baed..7c97de572a 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeAzimuthInclination.sqf +++ b/addons/vector/functions/fnc_modeAzimuthInclination.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_exit", "_time", "_direction", "_azimuth", "_inclination", "_digits"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeDistance.sqf b/addons/vector/functions/fnc_modeDistance.sqf similarity index 97% rename from TO_MERGE/agm/Vector/functions/fn_modeDistance.sqf rename to addons/vector/functions/fnc_modeDistance.sqf index e6c00f09f4..62fd9deb0a 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeDistance.sqf +++ b/addons/vector/functions/fnc_modeDistance.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_exit", "_distance", "_digits"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeDistanceAzimuth.sqf b/addons/vector/functions/fnc_modeDistanceAzimuth.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeDistanceAzimuth.sqf rename to addons/vector/functions/fnc_modeDistanceAzimuth.sqf index 37b49d3bfd..1f0aa0edb4 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeDistanceAzimuth.sqf +++ b/addons/vector/functions/fnc_modeDistanceAzimuth.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_time", "_direction", "_azimuth", "_exit", "_distance", "_digits"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeDistanceHeight.sqf b/addons/vector/functions/fnc_modeDistanceHeight.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeDistanceHeight.sqf rename to addons/vector/functions/fnc_modeDistanceHeight.sqf index 324152ae11..3f7753f886 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeDistanceHeight.sqf +++ b/addons/vector/functions/fnc_modeDistanceHeight.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_direction", "_azimuth", "_exit", "_distance", "_digits", "_inclination", "_height", "_lenght"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeFallOfShort.sqf b/addons/vector/functions/fnc_modeFallOfShort.sqf similarity index 99% rename from TO_MERGE/agm/Vector/functions/fn_modeFallOfShort.sqf rename to addons/vector/functions/fnc_modeFallOfShort.sqf index 463eefdf30..5b37f24c85 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeFallOfShort.sqf +++ b/addons/vector/functions/fnc_modeFallOfShort.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigit9", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_distanceP1", "_directionP1", "_azimuthP1", "_inclinationP1", "_directionP2", "_azimuthP2", "_abscissa", "_ordinate", "_applicate", "_distanceP2", "_digits", "_inclinationP2", "_height", "_lenght", "_digits0", "_digits1", "_digits2"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeRelativeAzimuthDistance.sqf b/addons/vector/functions/fnc_modeRelativeAzimuthDistance.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeRelativeAzimuthDistance.sqf rename to addons/vector/functions/fnc_modeRelativeAzimuthDistance.sqf index 9e9d12a543..283af8f395 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeRelativeAzimuthDistance.sqf +++ b/addons/vector/functions/fnc_modeRelativeAzimuthDistance.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_distanceP1", "_directionP1", "_azimuthP1", "_inclinationP1", "_directionP2", "_azimuthP2", "_distanceP2", "_inclinationP2", "_digits", "_relDirection", "_relDistance", "_relHeight", "_relLenght", "_digits0", "_digits1", "_digits2", "_lenghtP1", "_lenghtP2", "_relAzimuth"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeRelativeDistance.sqf b/addons/vector/functions/fnc_modeRelativeDistance.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeRelativeDistance.sqf rename to addons/vector/functions/fnc_modeRelativeDistance.sqf index 5e0901b4a1..0fa073a389 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeRelativeDistance.sqf +++ b/addons/vector/functions/fnc_modeRelativeDistance.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_distanceP1", "_directionP1", "_azimuthP1", "_inclinationP1", "_directionP2", "_azimuthP2", "_distanceP2", "_inclinationP2", "_relDirection", "_relDistance", "_distance", "_digits"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_modeRelativeDistanceHeight.sqf b/addons/vector/functions/fnc_modeRelativeDistanceHeight.sqf similarity index 98% rename from TO_MERGE/agm/Vector/functions/fn_modeRelativeDistanceHeight.sqf rename to addons/vector/functions/fnc_modeRelativeDistanceHeight.sqf index bfebb9de57..0663c31473 100644 --- a/TO_MERGE/agm/Vector/functions/fn_modeRelativeDistanceHeight.sqf +++ b/addons/vector/functions/fnc_modeRelativeDistanceHeight.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_distanceP1", "_directionP1", "_azimuthP1", "_inclinationP1", "_directionP2", "_azimuthP2", "_distanceP2", "_inclinationP2", "_azimuth", "_inclination", "_height", "_lenght", "_relDirection", "_relDistance", "_distance", "_digits"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_settings.sqf b/addons/vector/functions/fnc_settings.sqf similarity index 99% rename from TO_MERGE/agm/Vector/functions/fn_settings.sqf rename to addons/vector/functions/fnc_settings.sqf index 3db14168b3..5ff16d4b3e 100644 --- a/TO_MERGE/agm/Vector/functions/fn_settings.sqf +++ b/addons/vector/functions/fnc_settings.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private["_dlgVector", "_ctrlVectorCenter", "_ctrlVectorCrosshair", "_ctrlDigit0", "_ctrlDigit1", "_ctrlDigit2", "_ctrlDigit3", "_ctrlDigit4", "_ctrlDigit5", "_ctrlDigit6", "_ctrlDigit7", "_ctrlDigit8", "_ctrlDigit9", "_ctrlDigitE1", "_ctrlDigitE2", "_ctrlDigitE3", "_ctrlDigitE4", "_isFeet", "_isMil", "_time", "_theCount"]; diff --git a/TO_MERGE/agm/Vector/functions/fn_tabAzimuthKey.sqf b/addons/vector/functions/fnc_tabAzimuthKey.sqf similarity index 99% rename from TO_MERGE/agm/Vector/functions/fn_tabAzimuthKey.sqf rename to addons/vector/functions/fnc_tabAzimuthKey.sqf index 0a53443c14..0d7724dabc 100644 --- a/TO_MERGE/agm/Vector/functions/fn_tabAzimuthKey.sqf +++ b/addons/vector/functions/fnc_tabAzimuthKey.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" #define DELAY 0.3 diff --git a/TO_MERGE/agm/Vector/functions/fn_tabDistanceKey.sqf b/addons/vector/functions/fnc_tabDistanceKey.sqf similarity index 99% rename from TO_MERGE/agm/Vector/functions/fn_tabDistanceKey.sqf rename to addons/vector/functions/fnc_tabDistanceKey.sqf index fc790eb85e..bdd4587723 100644 --- a/TO_MERGE/agm/Vector/functions/fn_tabDistanceKey.sqf +++ b/addons/vector/functions/fnc_tabDistanceKey.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" #define DELAY 0.3 diff --git a/addons/vector/functions/script_component.hpp b/addons/vector/functions/script_component.hpp new file mode 100644 index 0000000000..d4007d8aa4 --- /dev/null +++ b/addons/vector/functions/script_component.hpp @@ -0,0 +1 @@ +#include "\z\ace\addons\vector\script_component.hpp" \ No newline at end of file diff --git a/TO_MERGE/agm/Vector/rsc/Vector_Center.paa b/addons/vector/rsc/Vector_Center.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/Vector_Center.paa rename to addons/vector/rsc/Vector_Center.paa diff --git a/TO_MERGE/agm/Vector/rsc/Vector_Crosshair.paa b/addons/vector/rsc/Vector_Crosshair.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/Vector_Crosshair.paa rename to addons/vector/rsc/Vector_Crosshair.paa diff --git a/TO_MERGE/agm/Vector/rsc/d+.paa b/addons/vector/rsc/d+.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d+.paa rename to addons/vector/rsc/d+.paa diff --git a/TO_MERGE/agm/Vector/rsc/d-.paa b/addons/vector/rsc/d-.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d-.paa rename to addons/vector/rsc/d-.paa diff --git a/TO_MERGE/agm/Vector/rsc/d0.paa b/addons/vector/rsc/d0.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d0.paa rename to addons/vector/rsc/d0.paa diff --git a/TO_MERGE/agm/Vector/rsc/d1.paa b/addons/vector/rsc/d1.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d1.paa rename to addons/vector/rsc/d1.paa diff --git a/TO_MERGE/agm/Vector/rsc/d2.paa b/addons/vector/rsc/d2.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d2.paa rename to addons/vector/rsc/d2.paa diff --git a/TO_MERGE/agm/Vector/rsc/d3.paa b/addons/vector/rsc/d3.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d3.paa rename to addons/vector/rsc/d3.paa diff --git a/TO_MERGE/agm/Vector/rsc/d4.paa b/addons/vector/rsc/d4.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d4.paa rename to addons/vector/rsc/d4.paa diff --git a/TO_MERGE/agm/Vector/rsc/d5.paa b/addons/vector/rsc/d5.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d5.paa rename to addons/vector/rsc/d5.paa diff --git a/TO_MERGE/agm/Vector/rsc/d6.paa b/addons/vector/rsc/d6.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d6.paa rename to addons/vector/rsc/d6.paa diff --git a/TO_MERGE/agm/Vector/rsc/d7.paa b/addons/vector/rsc/d7.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d7.paa rename to addons/vector/rsc/d7.paa diff --git a/TO_MERGE/agm/Vector/rsc/d8.paa b/addons/vector/rsc/d8.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d8.paa rename to addons/vector/rsc/d8.paa diff --git a/TO_MERGE/agm/Vector/rsc/d9.paa b/addons/vector/rsc/d9.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/d9.paa rename to addons/vector/rsc/d9.paa diff --git a/TO_MERGE/agm/Vector/rsc/dA.paa b/addons/vector/rsc/dA.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dA.paa rename to addons/vector/rsc/dA.paa diff --git a/TO_MERGE/agm/Vector/rsc/dC.paa b/addons/vector/rsc/dC.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dC.paa rename to addons/vector/rsc/dC.paa diff --git a/TO_MERGE/agm/Vector/rsc/dE.paa b/addons/vector/rsc/dE.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dE.paa rename to addons/vector/rsc/dE.paa diff --git a/TO_MERGE/agm/Vector/rsc/dF.paa b/addons/vector/rsc/dF.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dF.paa rename to addons/vector/rsc/dF.paa diff --git a/TO_MERGE/agm/Vector/rsc/dG.paa b/addons/vector/rsc/dG.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dG.paa rename to addons/vector/rsc/dG.paa diff --git a/TO_MERGE/agm/Vector/rsc/dL.paa b/addons/vector/rsc/dL.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dL.paa rename to addons/vector/rsc/dL.paa diff --git a/TO_MERGE/agm/Vector/rsc/dU.paa b/addons/vector/rsc/dU.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dU.paa rename to addons/vector/rsc/dU.paa diff --git a/TO_MERGE/agm/Vector/rsc/db.paa b/addons/vector/rsc/db.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/db.paa rename to addons/vector/rsc/db.paa diff --git a/TO_MERGE/agm/Vector/rsc/dd.paa b/addons/vector/rsc/dd.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dd.paa rename to addons/vector/rsc/dd.paa diff --git a/TO_MERGE/agm/Vector/rsc/debug_crosshair.paa b/addons/vector/rsc/debug_crosshair.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/debug_crosshair.paa rename to addons/vector/rsc/debug_crosshair.paa diff --git a/TO_MERGE/agm/Vector/rsc/di.paa b/addons/vector/rsc/di.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/di.paa rename to addons/vector/rsc/di.paa diff --git a/TO_MERGE/agm/Vector/rsc/dn.paa b/addons/vector/rsc/dn.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dn.paa rename to addons/vector/rsc/dn.paa diff --git a/TO_MERGE/agm/Vector/rsc/do.paa b/addons/vector/rsc/do.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/do.paa rename to addons/vector/rsc/do.paa diff --git a/TO_MERGE/agm/Vector/rsc/doo.paa b/addons/vector/rsc/doo.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/doo.paa rename to addons/vector/rsc/doo.paa diff --git a/TO_MERGE/agm/Vector/rsc/dp.paa b/addons/vector/rsc/dp.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dp.paa rename to addons/vector/rsc/dp.paa diff --git a/TO_MERGE/agm/Vector/rsc/dq.paa b/addons/vector/rsc/dq.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dq.paa rename to addons/vector/rsc/dq.paa diff --git a/TO_MERGE/agm/Vector/rsc/dr.paa b/addons/vector/rsc/dr.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dr.paa rename to addons/vector/rsc/dr.paa diff --git a/TO_MERGE/agm/Vector/rsc/dt.paa b/addons/vector/rsc/dt.paa similarity index 100% rename from TO_MERGE/agm/Vector/rsc/dt.paa rename to addons/vector/rsc/dt.paa diff --git a/addons/vector/script_component.hpp b/addons/vector/script_component.hpp new file mode 100644 index 0000000000..01ad0e8914 --- /dev/null +++ b/addons/vector/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT vector +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_VECTOR + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_ENABLED_VECTOR + #define DEBUG_SETTINGS DEBUG_ENABLED_VECTOR +#endif + +#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/TO_MERGE/agm/Vector/stringtable.xml b/addons/vector/stringtable.xml similarity index 90% rename from TO_MERGE/agm/Vector/stringtable.xml rename to addons/vector/stringtable.xml index a10b6ccc94..7a27cf272e 100644 --- a/TO_MERGE/agm/Vector/stringtable.xml +++ b/addons/vector/stringtable.xml @@ -1,8 +1,8 @@  - + - + Vector IV Vector IV Vector IV @@ -14,7 +14,7 @@ Vector IV Vector IV - + Rangefinder Laserentfernungsmesser Telémetro @@ -26,7 +26,7 @@ Telêmetro Дальномер - + Vector - Azimuth Key Vector - Azimuth-Taste Vector - Tecla de acimut @@ -38,7 +38,7 @@ Vector - Irányszög gomb Vector – Азимут - + Vector - Distance Key Vector - Entfernungs-Taste Vector - Tecla de distancia diff --git a/extras/blank/functions/script_component.hpp b/extras/blank/functions/script_component.hpp index 2cd25455d2..3cc9111162 100644 --- a/extras/blank/functions/script_component.hpp +++ b/extras/blank/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\blank_module\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\blank\script_component.hpp" \ No newline at end of file