Merge pull request #29 from SkippieDippie/rhs_usaf_greenmag

Hotfix to r27.02.2023

Author: SkippieDippie

cvo_compats_common/greenmag/config.cpp

@@ -1,6 +1,6 @@
 #include "macros_greenmag.hpp"
 
-//#if GREENMAG_LOADED
+#if GREENMAG_LOADED
 class CfgPatches {
 	class CVO_Compats_Common_GreenMag {
 		addonRootClass = "CVO_Compats_Common";
@@ -378,4 +378,4 @@ class CfgWeapons {
 	#include "belts\762x54_7T2.hpp"
 
 };
-//#endif
+#endif

cvo_compats_common/macros.hpp

@@ -6,20 +6,9 @@
 
 #define QUADRUPLES(var1,var2,var3,var4) var1##_##var2##_##var3##_##var4
 
-#if __has_include("\z\greenmag\addons\main\script_component.hpp")
-#define GREENMAG_LOADED 1
-#else
-#define GREENMAG_LOADED 0
-#endif
 
-#if __has_include("\rhsafrf\addons\rhs_main\script_component.hpp")
-#define RHS_AFRF_LOADED 1
-#else
-#define RHS_AFRF_LOADED 0
-#endif
+#define GREENMAG_LOADED __has_include("\z\greenmag\addons\main\script_component.hpp")
 
-#if __has_include("\rhsusf\addons\rhsusf_main\script_component.hpp")
-#define RHS_USAF_LOADED 1
-#else
-#define RHS_USAF_LOADED 0
-#endif
+#define RHS_AFRF_LOADED __has_include("\rhsafrf\addons\rhs_main\script_component.hpp")
+
+#define RHS_USAF_LOADED __has_include("\rhsusf\addons\rhsusf_main\script_component.hpp")

cvo_compats_rhsusaf/greenmag/config.cpp

@@ -23,8 +23,11 @@ class CfgMagazines {
 	class CA_Magazine;
 
 	#include "magazines\rhs_usaf_127x99.hpp"
+	#include "magazines\rhs_usaf_46x30.hpp"
 	#include "magazines\rhs_usaf_556x45.hpp"
 	#include "magazines\rhs_usaf_762x51.hpp"
+	#include "magazines\rhs_usaf_762x67.hpp"
+	#include "magazines\rhs_usaf_9x19.hpp"
 
 };
 

cvo_compats_rhsusaf/greenmag/magazines/rhs_usaf_46x30.hpp

@@ -0,0 +1,20 @@
+class rhsusf_mag_40Rnd_46x30_AP : CA_Magazine {
+	greenmag_canSpeedload = 1;
+	greenmag_needBelt = 0;
+	greenmag_ammo = QAMMO_CLASS(46x30_AP_1Rnd);
+	greenmag_basicammo = QAMMO_CLASS(46x30_Basic_1Rnd);	
+};
+
+class rhsusf_mag_40Rnd_46x30_FMJ : CA_Magazine {
+	greenmag_canSpeedload = 1;
+	greenmag_needBelt = 0;
+	greenmag_ammo = QAMMO_CLASS(46x30_FMJ_1Rnd);
+	greenmag_basicammo = QAMMO_CLASS(46x30_Basic_1Rnd);	
+};
+
+class rhsusf_mag_40Rnd_46x30_JHP : CA_Magazine {
+	greenmag_canSpeedload = 1;
+	greenmag_needBelt = 0;
+	greenmag_ammo = QAMMO_CLASS(46x30_JHP_1Rnd);
+	greenmag_basicammo = QAMMO_CLASS(46x30_Basic_1Rnd);	
+};

cvo_compats_rhsusaf/greenmag/magazines/rhs_usaf_9x19.hpp

@@ -0,0 +1,10 @@
+class rhsusf_mag_17Rnd_9x19_FMJ : CA_Magazine {
+	greenmag_canSpeedload = 1;
+	greenmag_needBelt = 0;
+	greenmag_ammo = QAMMO_CLASS(9x19_M882_1Rnd);
+	greenmag_basicammo = "greenmag_ammo_9x19_basic_1Rnd";
+};
+
+class rhsusf_mag_17Rnd_9x19_JHP : rhsusf_mag_17Rnd_9x19_FMJ {
+	greenmag_ammo = QAMMO_CLASS(9x19_Mk243_1Rnd);
+};