Merge pull request #570 from Vdauphin/Add-clean-up-redeploy

Add: Clean up redeploy
Vdauphin · Jul 3, 2018 · 29a34f1 · 29a34f1
2 parents 690cc2d + 582b734
commit 29a34f1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 66 deletions.
diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf
@@ -265,7 +265,6 @@ if (!isDedicated) then {
 
     //FOB
     btc_fnc_fob_create = compile preprocessFileLineNumbers "core\fnc\fob\create.sqf";
-    btc_fnc_fob_lb_change = compile preprocessFileLineNumbers "core\fnc\fob\lb_change.sqf";
     btc_fnc_fob_redeploy = compile preprocessFileLineNumbers "core\fnc\fob\redeploy.sqf";
     btc_fnc_fob_dismantle = compile preprocessFileLineNumbers "core\fnc\fob\dismantle.sqf";
 

diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/fob/dlg.hpp b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/fob/dlg.hpp
@@ -35,7 +35,7 @@ class btc_fob_create {
             h = 0.025 * safezoneH;
         };
         class btc_fob_dlg_apply : btc_dlg_button {
-            text = $STR_BTC_HAM_O_FOB_DLG_T_APPLY; //Apply
+            text = $STR_ui_debug_but_apply; //Apply
             action = "btc_fob_dlg = true;";
             x = 0.45 * safezoneW + safezoneX;
             y = 0.5 * safezoneH + safezoneY;
@@ -44,49 +44,3 @@ class btc_fob_create {
         };
     };
 };
-class btc_fob_redeploy {
-    idd = -1;
-    movingEnable = 1;
-    onLoad = "uiNamespace setVariable [""btc_fob_redeploy"", _this select 0];";
-    objects[] = {};
-    class controlsBackground {
-
-    };
-    class controls {
-        class btc_fob_dlg_re_background : btc_dlg_RscText {
-            idc = -1;
-            x = 0.4 * safezoneW + safezoneX;
-            y = 0.05 * safezoneH + safezoneY;
-            w = 0.2 * safezoneW;
-            h = 0.1 * safezoneH;
-            colorBackground[] = {0, 0, 0, 0.65};
-            text = "";
-        };
-        class btc_fob_dlg_re_text : btc_dlg_RscText {
-            idc = -1;
-            colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R', 0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G', 0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B', 0.8862])", "(profilenamespace getvariable ['GUI_BCG_RGB_A', 0.7])"};
-            x = 0.4 * safezoneW + safezoneX;
-            y = 0.05 * safezoneH + safezoneY;
-            w = 0.2 * safezoneW;
-            h = 0.025 * safezoneH;
-            colorText[] = {1, 1, 1, 1};
-            text = $STR_BTC_HAM_O_FOB_DLG_T_SELECTFOB; //STR_BTC_HAM_O_FOB_DLG_T_SELECTFOB
-        };
-        class btc_fob_dlg_re_fobs: btc_dlg_comboBox {
-            idc = 778;
-            x = 0.4 * safezoneW + safezoneX;
-            y = 0.1 * safezoneH + safezoneY;
-            w = 0.2 * safezoneW;
-            h = 0.017 * safezoneH;
-            onLBSelChanged  = "[] call btc_fnc_fob_lb_change";
-        };
-        class btc_fob_dlg_apply : btc_dlg_button {
-            text = $STR_BTC_HAM_O_FOB_DLG_T_APPLY; //Apply
-            action = "btc_fob_dlg = true;";
-            x = 0.45 * safezoneW + safezoneX;
-            y = 0.125 * safezoneH + safezoneY;
-            w = 0.1 * safezoneW;
-            default = true;
-        };
-    };
-};
diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/fob/lb_change.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/fob/lb_change.sqf
diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml b/=BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
@@ -1410,16 +1410,6 @@
                 <Spanish>Nombra el FOB:</Spanish>
                 <German>FOB Benennen:</German>
             </Key>
-            <Key ID="STR_BTC_HAM_O_FOB_DLG_T_APPLY">
-                <Original>Apply</Original>
-                <Spanish>Aplicar</Spanish>
-                <German>Bestätigen</German>
-            </Key>
-            <Key ID="STR_BTC_HAM_O_FOB_DLG_T_SELECTFOB">
-                <Original>Select the FOB:</Original>
-                <Spanish>Selecciona el FOB:</Spanish>
-                <German>FOB auswählen:</German>
-            </Key>
         </Container>
         <Container name="Other: Hints ">
             <Key ID="STR_BTC_HAM_O_COMMON_SHOWHINTS_0">