feat: remove macros for assigning multiple items, didn't work properly

tfp-milsim · Jan 23, 2024 · f8cbf85 · f8cbf85
1 parent da635c1
commit f8cbf85
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 30 deletions.
diff --git a/addons/units/config.cpp b/addons/units/config.cpp
@@ -3,28 +3,21 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        units[] = {};
+        units[] = {
+            "PMCS_B_Rifleman"
+        };
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
-            // Base game
-            "A3_Sounds_F",
-            "A3_Sounds_F_Exp",
-            "A3_Soft_F",
-            "A3_Data_F",
-            "A3_Data_F_ParticleEffects",
+            "A3_Air_F_Heli",
             "A3_Characters_F",
-
-            // ACE
+            "A3_Data_F",
+            "A3_Data_F_Curator",
+            "MCX_Virtus_cfg",
+            "VSM_HELMETS",
+            "VSM_Multicam_Config",
             "ace_thermals",
-
-            // Other
-            "RKSL_attachments_core",
-            "RKSL_EOT552",
-            "RKSL_LDS",
-            "RKSL_PM_525",
-            "RKSL_PM_II",
-            "RKSL_RMR",
+            "ace_vector"
         };
         author = ECSTRING(common,PMCSTeam);
         authors[] = {"hbjydev"};

diff --git a/addons/units/script_macros.hpp b/addons/units/script_macros.hpp
@@ -9,11 +9,6 @@
 
 #define UNITGROUP(SIDE,NAME) QUOTE(PMCS_##SIDE##_##NAME)
 
-#define LINKEDITEMS(items) linkedItems[] = items; respawnLinkedItems[] = items
-#define WEAPONS(items) weapons[] = items; respawnWeapons[] = items
-#define ITEMS(items) Items[] = items; RespawnItems[] = items
-#define MAGAZINES(items) magazines[] = items; respawnMagazines[] = items
-
 #define MAG_2(a) "a", "a"
 #define MAG_3(a) "a", "a", "a"
 #define MAG_4(a) "a", "a", "a", "a"

diff --git a/addons/units/units/soldiers_b.hpp b/addons/units/units/soldiers_b.hpp
@@ -26,8 +26,8 @@ class PMCS_B_Soldier_base : B_Soldier_base_F {
 
 	uniformClass = "VSM_Multicam_Crye_grey_shirt_Camo";
 
-	#define PMCS_B_Soldier_base_linkedItems { "VSM_LBT6094_operator_multicam", "VSM_OPS_multicam", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio", "ACE_Vector" }
-	LINKEDITEMS(PMCS_B_Soldier_base_linkedItems);
+	linkedItems[] = { "VSM_LBT6094_operator_multicam", "VSM_OPS_multicam", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio", "ACE_Vector" };
+	respawnLinkedItems[] = { "VSM_LBT6094_operator_multicam", "VSM_OPS_multicam", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio", "ACE_Vector" };
 };
 
 class PMCS_B_Rifleman : PMCS_B_Soldier_base {
@@ -43,12 +43,12 @@ class PMCS_B_Rifleman : PMCS_B_Soldier_base {
 
 	backpack = "VSM_Multicam_Backpack_Compact";
 
-	#define PMCS_B_Rifleman_weapons { "MCX_Virtus_14_b_s4", "hgun_P07_F", "Throw", "Put" }
-	WEAPONS(PMCS_B_Rifleman_weapons);
+	weapons[] = { "MCX_Virtus_14_b_s4", "hgun_P07_F", "Throw", "Put" };
+	respawnWeapons[] = { "MCX_Virtus_14_b_s4", "hgun_P07_F", "Throw", "Put" };
 
-	#define PMCS_B_Rifleman_items { "FirstAidKit" }
-	ITEMS(PMCS_B_Rifleman_items);
+	Items[] = { "FirstAidKit" };
+	RespawnItems[] = { "FirstAidKit" };
 
-	#define PMCS_B_Rifleman_magazines { MAG_10(30Rnd_65x39_caseless_mag), MAG_3(16Rnd_9x21_Mag), "SmokeShell", "SmokeShellGreen", "Chemlight_green", "Chemlight_green", MAG_2(HandGrenade) }
-	MAGAZINES(PMCS_B_Rifleman_magazines);
+	magazines[] = { MAG_5(ACE_30Rnd_556x45_Stanag_Mk318_mag), MAG_2(16Rnd_9x21_Mag), "SmokeShell", "SmokeShellGreen", "Chemlight_green", "Chemlight_green", MAG_2(HandGrenade) };
+	respawnMagazines[] = { MAG_5(ACE_30Rnd_556x45_Stanag_Mk318_mag), MAG_2(16Rnd_9x21_Mag), "SmokeShell", "SmokeShellGreen", "Chemlight_green", "Chemlight_green", MAG_2(HandGrenade) };
 };