General - Fix broken inheritance (#696)

**When merged this pull request will:** - Title ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
KAT-Advanced-Medical · Jan 14, 2025 · 50bf5ac · 50bf5ac
1 parent 7398fc8
commit 50bf5ac
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 64 deletions.
diff --git a/addons/airway/CfgVehicles.hpp b/addons/airway/CfgVehicles.hpp
@@ -47,12 +47,9 @@ class CfgVehicles {
         hiddenSelectionsTextures[] = {QPATHTOF(ui\vomit.paa)};
     };
 
-    class NATO_Box_Base;
-    class ACE_medicalSupplyCrate: NATO_Box_Base {
-        class TransportItems;
-    };
+    class ACE_medicalSupplyCrate;
     class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_larynx,15);
             MACRO_ADDITEM(kat_guedel,15);
             MACRO_ADDITEM(kat_suction,15);

diff --git a/addons/breathing/CfgVehicles.hpp b/addons/breathing/CfgVehicles.hpp
@@ -34,13 +34,9 @@ class CfgVehicles {
         };
     };
 
-    class NATO_Box_Base;
-    class ACE_medicalSupplyCrate: NATO_Box_Base {
-        class TransportItems;
-        class TransportMagazines;
-    };
+    class ACE_medicalSupplyCrate;
     class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_Pulseoximeter,3);
             MACRO_ADDITEM(kat_chestSeal,25);
             MACRO_ADDITEM(kat_aatKit,10);
@@ -49,14 +45,14 @@ class CfgVehicles {
             MACRO_ADDITEM(kat_pocketBVM,5);
             MACRO_ADDITEM(kat_nasal,10);
         };
-        class TransportMagazines: TransportMagazines {
+        class TransportMagazines {
             MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
             MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
         };
     };
     class kat_basicSupplyCrate: ACE_medicalSupplyCrate {
         displayName = CSTRING(basicSupplyCrate_display);
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(Attachable_Helistretcher,5);
             MACRO_ADDITEM(kat_stretcherBag,5);
             MACRO_ADDITEM(kat_accuvac,2);
@@ -77,7 +73,7 @@ class CfgVehicles {
             MACRO_ADDITEM(kat_BVM,5);
             MACRO_ADDITEM(kat_pocketBVM,5);
         };
-        class TransportMagazines: TransportMagazines {
+        class TransportMagazines {
             MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
             MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
         };

diff --git a/addons/chemical/CfgVehicles.hpp b/addons/chemical/CfgVehicles.hpp
@@ -222,7 +222,7 @@ class CfgVehicles {
         class TransportMagazines;
     };
     class ACE_Box_82mm_Mo_Combo: ACE_Box_82mm_Mo_HE {
-        class TransportMagazines: TransportMagazines {
+        class TransportMagazines {
             MACRO_ADDMAGAZINE(KAT_1Rnd_82mm_Mo_Type0,8);
             MACRO_ADDMAGAZINE(KAT_1Rnd_82mm_Mo_TypeCS,8);
         };

diff --git a/addons/circulation/ACE_Medical_Treatment_Actions.hpp b/addons/circulation/ACE_Medical_Treatment_Actions.hpp
@@ -1,8 +1,8 @@
 class ACE_Medical_Treatment_Actions {
-    class FieldDressing;
+    class BasicBandage;
     class Morphine;
     class CheckPulse;
-    class CPR {
+    class CPR: BasicBandage {
         displayNameProgress = "";
         treatmentTime = 0.01;
         callbackStart = "";

diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp
@@ -4,11 +4,7 @@ class CfgVehicles {
     class Item_Base_F;
     class Items_base_F;
     class WeaponHolder_Single_limited_item_F;
-    class NATO_Box_Base;
-    class ACE_medicalSupplyCrate: NATO_Box_Base {
-        class TransportItems;
-        class TransportMagazines;
-    };
+    class ACE_medicalSupplyCrate;
 
     class Land_Defibrillator_F: Items_base_F {
         ace_dragging_canCarry = 1;
@@ -187,20 +183,20 @@ class CfgVehicles {
     };
 
     class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_X_AED,1);
             MACRO_ADDITEM(kat_AED,1);
             MACRO_ADDITEM(KAT_Empty_bloodIV_500,10);
             MACRO_ADDITEM(KAT_Empty_bloodIV_250,20);
             MACRO_ADDITEM(kat_crossPanel,5);
         };
-        class TransportMagazines: TransportMagazines {
+        class TransportMagazines {
             MACRO_ADDMAGAZINE(kat_Painkiller,10);
         };
     };
     class kat_medicalSupplyCrate: ACE_medicalSupplyCrate {
         displayName = CSTRING(bloodbank);
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_crossPanel,2);
             MACRO_ADDITEM(kat_IO_FAST,15);
             MACRO_ADDITEM(kat_IV_16,15);
@@ -237,7 +233,7 @@ class CfgVehicles {
     class Car: LandVehicle {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -247,7 +243,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -261,7 +257,7 @@ class CfgVehicles {
     class Quadbike_01_base_F: Car_F {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -271,7 +267,7 @@ class CfgVehicles {
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -284,7 +280,7 @@ class CfgVehicles {
     class Kart_01_Base_F: Car_F {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -294,7 +290,7 @@ class CfgVehicles {
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -307,7 +303,7 @@ class CfgVehicles {
     class Tank: LandVehicle {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -317,7 +313,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -330,7 +326,7 @@ class CfgVehicles {
     class Motorcycle: LandVehicle {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -340,7 +336,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -354,7 +350,7 @@ class CfgVehicles {
     class Helicopter: Air {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -364,7 +360,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -377,7 +373,7 @@ class CfgVehicles {
     class Plane: Air {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -387,7 +383,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -401,7 +397,7 @@ class CfgVehicles {
     class Ship_F: Ship {
         class ACE_SelfActions {
             class KAT_ArterialTest {
-                displayName = CSTRING(Arterial_Test_Action); 
+                displayName = CSTRING(Arterial_Test_Action);
                 condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                 statement = "";
                 insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
@@ -411,7 +407,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
-                    displayName = CSTRING(Arterial_Test_Action); 
+                    displayName = CSTRING(Arterial_Test_Action);
                     condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
                     statement = "";
                     insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));

diff --git a/addons/misc/ACE_Medical_Treatment_Actions.hpp b/addons/misc/ACE_Medical_Treatment_Actions.hpp
@@ -2,6 +2,7 @@ class ACE_Medical_Treatment_Actions {
     class SalineIV;
     class BasicBandage;
     class SurgicalKit;
+    class ApplyTourniquet;
     class SalineIV_Stand: SalineIV {
         displayName = CSTRING(Display_IVStand);
         medicRequired = 0;
@@ -20,7 +21,7 @@ class ACE_Medical_Treatment_Actions {
         condition = QUOTE([ARR_2(_medic,250)] call FUNC(conditionIV));
         callbackSuccess = QUOTE([ARR_5(_medic,_patient,_bodyPart,'SalineIV_250','ACE_salineIV_250')] call FUNC(treatmentIV));
     };
-    class RemoveTourniquet: BasicBandage {
+    class RemoveTourniquet: ApplyTourniquet {
         treatmentTime = QGVAR(treatmentTimeDetachTourniquet);
     };
     class FullBodySurgicalKit: SurgicalKit {
@@ -29,4 +30,4 @@ class ACE_Medical_Treatment_Actions {
         condition = QFUNC(canStitchFullBody);
         callbackProgress = QFUNC(surgicalKitProgressFullBody);
     };
-};
+};
diff --git a/addons/pharma/CfgVehicles.hpp b/addons/pharma/CfgVehicles.hpp
@@ -4,12 +4,8 @@ class CfgVehicles {
     class Item_Base_F;
     class Items_base_F;
     class WeaponHolder_Single_limited_item_F;
-    class NATO_Box_Base;
-    class ACE_medicalSupplyCrate: NATO_Box_Base {
-        class TransportItems;
-        class TransportMagazines;
-    };
-
+    class ACE_medicalSupplyCrate;
+
     class Land_Defibrillator_F: Items_base_F {
         ace_dragging_canCarry = 1;
         ace_dragging_carryPosition[] = {0,1,1};
@@ -28,9 +24,9 @@ class CfgVehicles {
             MACRO_ADDITEM(kat_Painkiller,1);
         };
     };
-    
+
     class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_amiodarone,20);
             MACRO_ADDITEM(kat_atropine,20);
             MACRO_ADDITEM(kat_IO_FAST,20);
@@ -49,13 +45,13 @@ class CfgVehicles {
             MACRO_ADDITEM(kat_etomidate,20);
             MACRO_ADDITEM(kat_EACA,20);
         };
-        class TransportMagazines: TransportMagazines {
+        class TransportMagazines {
             MACRO_ADDMAGAZINE(kat_Carbonate,10);
         };
     };
     class kat_pharmaMedicalCrate: ACE_medicalSupplyCrate {
         displayName = CSTRING(pharmaSupplyCrate_displayName);
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_amiodarone,15);
             MACRO_ADDITEM(kat_atropine,15);
             MACRO_ADDITEM(kat_EACA,15);
@@ -69,9 +65,9 @@ class CfgVehicles {
             MACRO_ADDITEM(kat_TXA,15);
             MACRO_ADDITEM(kat_nitroglycerin,15);
         };
-        class TransportMagazines: TransportMagazines {
+        class TransportMagazines {
             MACRO_ADDMAGAZINE(kat_Carbonate,15);
             MACRO_ADDMAGAZINE(kat_Painkiller,15);
         };
     };
-};
+};
diff --git a/addons/stretcher/CfgVehicles.hpp b/addons/stretcher/CfgVehicles.hpp
@@ -19,13 +19,12 @@ class CfgVehicles {
         mass = 60;
     };
 
-    class Tank: LandVehicle {};
-    class Tank_F: Tank {
+    class Tank: LandVehicle {
         class ACE_Actions {
             class ACE_MainActions;
         };
     };
-    class kat_stretcher: Tank_F {
+    class kat_stretcher: Tank {
         explosionEffect = "";
         fuelExplosionPower = 0;
         editorForceEmpty = 1;
@@ -41,6 +40,7 @@ class CfgVehicles {
         armor = 20;
         displayName = CSTRING(Stretcher_Display);
         model = QPATHTOF(models\stretcher\vurtual_stretcher.p3d);
+        driverOpticsModel = "";
         simulation = "tankX";
         crewVulnerable = 1;
         explosionShielding = 0;

diff --git a/addons/surgery/CfgVehicles.hpp b/addons/surgery/CfgVehicles.hpp
@@ -4,15 +4,11 @@ class CfgVehicles {
     class Item_Base_F;
     class Items_base_F;
     class WeaponHolder_Single_limited_item_F;
-    class NATO_Box_Base;
-    class ACE_medicalSupplyCrate: NATO_Box_Base {
-        class TransportItems;
-        class TransportMagazines;
-    };
+    class ACE_medicalSupplyCrate;
 
     class kat_surgerySupplyCrate: ACE_medicalSupplyCrate {
         displayName = CSTRING(surgeryToolbox);
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_etomidate,15);
             MACRO_ADDITEM(kat_flumazenil,15);
             MACRO_ADDITEM(kat_lorazepam,15);