Merge pull request #3291 from jaj22/fix-buy-vehicle-tagging

Fix buy vehicle menu function tagging
official-antistasi-community · Jun 15, 2024 · 131573e · 131573e
2 parents ab92d81 + 863717c
commit 131573e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/A3A/addons/gui/dialogues/buyVehicleDialog.hpp b/A3A/addons/gui/dialogues/buyVehicleDialog.hpp
@@ -1,7 +1,7 @@
 class A3A_BuyVehicleDialog : A3A_TabbedDialog
 {
-  idd = A3A_IDD_BUYVEHICLEDIALOG;
-  onLoad = "[""onLoad""] spawn A3A_fnc_buyVehicleDialog";
+    idd = A3A_IDD_BUYVEHICLEDIALOG;
+    onLoad = "[""onLoad""] spawn A3A_GUI_fnc_buyVehicleDialog";
 
     class Controls
     {
@@ -29,7 +29,7 @@ class A3A_BuyVehicleDialog : A3A_TabbedDialog
                 {
                     idc = -1;
                     text = $STR_antistasi_dialogs_vehicle_tab_civ;
-                    onButtonClick = "[""switchTab"", [""civilian""]] call A3A_fnc_buyVehicleDialog";
+                    onButtonClick = "[""switchTab"", [""civilian""]] call A3A_GUI_fnc_buyVehicleDialog";
                     x = 0;
                     y = 0;
                     w = 30 * GRID_W;
@@ -40,7 +40,7 @@ class A3A_BuyVehicleDialog : A3A_TabbedDialog
                 {
                     idc = -1;
                     text = $STR_antistasi_dialogs_vehicle_tab_reb;
-                    onButtonClick = "[""switchTab"", [""rebel""]] call A3A_fnc_buyVehicleDialog";
+                    onButtonClick = "[""switchTab"", [""rebel""]] call A3A_GUI_fnc_buyVehicleDialog";
                     x = 30 * GRID_W;
                     y = 0;
                     w = 30 * GRID_W;
@@ -51,7 +51,7 @@ class A3A_BuyVehicleDialog : A3A_TabbedDialog
                 {
                     idc = -1;
                     text = $STR_antistasi_dialogs_vehicle_tab_static;
-                    onButtonClick = "[""switchTab"", [""static""]] call A3A_fnc_buyVehicleDialog";
+                    onButtonClick = "[""switchTab"", [""static""]] call A3A_GUI_fnc_buyVehicleDialog";
                     x = 60 * GRID_W;
                     y = 0;
                     w = 30 * GRID_W;
@@ -62,7 +62,7 @@ class A3A_BuyVehicleDialog : A3A_TabbedDialog
                 {
                     idc = -1;
                     text = $STR_antistasi_dialogs_vehicle_tab_other;
-                    onButtonClick = "[""switchTab"", [""other""]] call A3A_fnc_buyVehicleDialog";
+                    onButtonClick = "[""switchTab"", [""other""]] call A3A_GUI_fnc_buyVehicleDialog";
                     x = 90 * GRID_W;
                     y = 0;
                     w = 30 * GRID_W;
@@ -179,4 +179,4 @@ class A3A_BuyVehicleDialog : A3A_TabbedDialog
             zoomDuration = 0.001;
         };
     };
-};
+};
diff --git a/A3A/addons/gui/functions/GUI/fn_buyVehicleDialog.sqf b/A3A/addons/gui/functions/GUI/fn_buyVehicleDialog.sqf
@@ -13,7 +13,7 @@ Public: No
 Dependencies:
     None
 Example:
-    ["onLoad"] spawn A3A_fnc_buyVehicleDialog; // initialization
+    ["onLoad"] spawn A3A_GUI_fnc_buyVehicleDialog; // initialization
 */
 
 #include "..\..\dialogues\ids.inc"
@@ -98,10 +98,10 @@ switch (_mode) do
         (A3A_faction_reb get 'staticAT') +
         (A3A_faction_reb get 'staticAA');
 
-        ["vehicles", [A3A_IDC_BUYCIVVEHICLEMAIN, A3A_IDC_CIVVEHICLESGROUP, _civilianVehicles]] call A3A_fnc_buyVehicleTabs;
-        ["vehicles", [A3A_IDC_BUYREBVEHICLEMAIN, A3A_IDC_REBVEHICLESGROUP, _militaryVehicles]] call A3A_fnc_buyVehicleTabs;
-        ["vehicles", [A3A_IDC_BUYSTATICMAIN, A3A_IDC_STATICSGROUP, _statics]] call A3A_fnc_buyVehicleTabs;
-        ["other"] call A3A_fnc_buyVehicleTabs;
+        ["vehicles", [A3A_IDC_BUYCIVVEHICLEMAIN, A3A_IDC_CIVVEHICLESGROUP, _civilianVehicles]] call A3A_GUI_fnc_buyVehicleTabs;
+        ["vehicles", [A3A_IDC_BUYREBVEHICLEMAIN, A3A_IDC_REBVEHICLESGROUP, _militaryVehicles]] call A3A_GUI_fnc_buyVehicleTabs;
+        ["vehicles", [A3A_IDC_BUYSTATICMAIN, A3A_IDC_STATICSGROUP, _statics]] call A3A_GUI_fnc_buyVehicleTabs;
+        ["other"] call A3A_GUI_fnc_buyVehicleTabs;
 
         // show the vehicle tab so that user don't freak out
         private _display = findDisplay A3A_IDD_BUYVEHICLEDIALOG;
@@ -115,4 +115,4 @@ switch (_mode) do
         // Log error if attempting to call a mode that doesn't exist
         Error_1("BuyVehicleDialog mode does not exist: %1", _mode);
     };
-};
+};
diff --git a/A3A/addons/gui/functions/GUI/fn_buyVehicleTabs.sqf b/A3A/addons/gui/functions/GUI/fn_buyVehicleTabs.sqf
@@ -17,7 +17,7 @@ Dependencies:
     None
 
 Example:
-    ["logistics"] call A3A_fnc_buyVehicleTab;
+    ["logistics"] call A3A_GUI_fnc_buyVehicleTab;
 */
 
 #include "..\..\dialogues\ids.inc"
@@ -60,7 +60,7 @@ if (_tab isEqualTo "vehicles") then
         private _configClass = configFile >> "CfgVehicles" >> _className;
         if (!isClass _configClass) then { continue };
 
-        private _crewCount = [_className] call A3A_fnc_getVehicleCrewCount;
+        private _crewCount = [_className] call A3A_GUI_fnc_getVehicleCrewCount;
         _crewCount params ["_driver", "_coPilot", "_commander", "_gunners", "_passengers", "_passengersFFV"];
 
         private _displayName = getText (_configClass >> "displayName");