Move wind info display to weather

addons/advanced_ballistics/RscTitles.hpp

@@ -1,34 +1,5 @@
 class RscTitles
 {
-	class RscWindIntuitive
-	{
-		idd=-1;
-		onLoad="with uiNameSpace do { RscWindIntuitive = _this select 0 };";
-		movingEnable=0;
-		duration=60;
-		fadeIn="false";
-		fadeOut="false";
-		class controls
-		{
-			class RscWindIntuitive
-			{
-				idc=132948;
-				type=0;
-				style=48;
-				font="TahomaB";
-				colorBackground[]={0,0,0,0};
-				colorText[]={0,0,0,0};
-				x="SafeZoneX + 0.001";
-				y="SafeZoneY + 0.001";
-				w=0.2;
-				h=0.2*4/3;
-				size=0.034;
-				sizeEx=0.027;
-				text="";
-			};
-		};
-	};
-	
 	class RscTurretDial
 	{
 		idd=-1;

addons/advanced_ballistics/XEH_preInit.sqf

@@ -11,7 +11,6 @@ PREP(calculateRoughnessLength);
 PREP(calculateStabilityFactor);
 PREP(calculateWindSpeed);
 PREP(displayProtractor);
-PREP(displayWindInfo);
 PREP(handleFired);
 PREP(handleFiredExtension);
 PREP(initializeTerrainExtension);

addons/advanced_ballistics/config.cpp

@@ -12,14 +12,6 @@ class CfgPatches {
     };
 };
 
-class CfgAddons {
-    class PreloadAddons {
-       class ADDON {
-          list[] = {QUOTE(ADDON)};
-       };
-    };
-};
-
 #include "CfgEventHandlers.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"

addons/advanced_ballistics/initKeybinds.sqf

@@ -1,15 +1,3 @@
-["ACE3", QGVAR(WindInfoKey), localize "STR_ACE_AdvancedBallistics_WindInfoKey",
-{
-    // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
-    
-    // Statement
-    [] call FUNC(displayWindInfo);
-    false
-},
-{false},
-[37, [true, false, false]], false, 0] call CBA_fnc_addKeybind; // (SHIFT + K)
-
 ["ACE3", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey",
 {
     // Conditions: canInteract

addons/weather/RscTitles.hpp

@@ -0,0 +1,31 @@
+class RscTitles
+{
+    class RscWindIntuitive
+    {
+        idd=-1;
+        onLoad="with uiNameSpace do { RscWindIntuitive = _this select 0 };";
+        movingEnable=0;
+        duration=60;
+        fadeIn="false";
+        fadeOut="false";
+        class controls
+        {
+            class RscWindIntuitive
+            {
+                idc=132948;
+                type=0;
+                style=48;
+                font="TahomaB";
+                colorBackground[]={0,0,0,0};
+                colorText[]={0,0,0,0};
+                x="SafeZoneX + 0.001";
+                y="SafeZoneY + 0.001";
+                w=0.2;
+                h=0.2*4/3;
+                size=0.034;
+                sizeEx=0.027;
+                text="";
+            };
+        };
+    };
+};

addons/weather/XEH_postInit.sqf

@@ -11,6 +11,18 @@
     };
 };
 
+["ACE3", QGVAR(WindInfoKey), localize "STR_ACE_Weather_WindInfoKey",
+{
+    // Conditions: canInteract
+    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+
+    // Statement
+    [] call FUNC(displayWindInfo);
+    false
+},
+{false},
+[37, [true, false, false]], false, 0] call CBA_fnc_addKeybind; // (SHIFT + K)
+
 // Update Wind
 simulWeatherSync;
 _fnc_updateWind = {

addons/weather/XEH_preInit.sqf

@@ -4,10 +4,10 @@
 ADDON = false;
 LOG(MSG_INIT);
 
-PREP(serverController);
+PREP(displayWindInfo);
 PREP(getMapData);
 PREP(getWind);
-
+PREP(serverController);
 
 
 // Rain variables

addons/weather/config.cpp

@@ -6,11 +6,11 @@ class CfgPatches {
         weapons[] = {};// "ACE_Kestrel4500" };
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
-        author[] = {"q1184", "Rocko", "esteldunedain"};
+        author[] = {"q1184", "Rocko", "esteldunedain","Ruthberg"};
         VERSION_CONFIG;
     };
 };
 
 #include "CfgEventhandlers.hpp"
-
 #include "CfgWorlds.hpp"
+#include "RscTitles.hpp"

addons/weather/stringtable.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project name="ACE">
+    <Package name="Weather">
+        <Key ID="STR_ACE_Weather_WindInfoKey">
+            <English>Show Wind Info</English>
+        </Key>
+    </Package>
+</Project>