Skip to content

Commit 7e78bc1

Browse files
SkippieDippieSkippieDippie
authored
Merge pull request #27 from SkippieDippie/rhs_usaf_greenmag
RHS USAF GreenMag Compatibility
2 parents 87af5ef + 9946eef commit 7e78bc1

File tree

20 files changed

+621
-206
lines changed

20 files changed

+621
-206
lines changed

‎cvo_compats_common/config.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "macros.hpp"
2+
13
class CfgPatches {
24
class CVO_Compats_Common {
35
author = "Skippie [CVO]";
@@ -11,3 +13,4 @@ class CfgPatches {
1113
weapons[] = {};
1214
};
1315
};
16+

‎cvo_compats_common/greenmag/ammo/762x51_M80A1.hpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
class AMMO_CLASS(762x51_M81A1_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2-
displayName = CESTRING(ammo,762x51_M81A1_1Rnd,name);
1+
class AMMO_CLASS(762x51_M80A1_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2+
displayName = CESTRING(ammo,762x51_M80A1_1Rnd,name);
33
picture = "\z\greenmag\addons\main\data\762mm.paa";
44

55
scope = 2;
@@ -9,76 +9,76 @@ class AMMO_CLASS(762x51_M81A1_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
99
};
1010
};
1111

12-
class AMMO_CLASS(762x51_M81A1_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
13-
displayName = CESTRING(ammo,762x51_M81A1_10Rnd,name);
12+
class AMMO_CLASS(762x51_M80A1_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
13+
displayName = CESTRING(ammo,762x51_M80A1_10Rnd,name);
1414

1515
scope = 2;
1616

17-
greenmag_ammotype = QAMMO_CLASS(762x51_M81A1_1Rnd);
17+
greenmag_ammotype = QAMMO_CLASS(762x51_M80A1_1Rnd);
1818

1919
class ItemInfo : CBA_MiscItem_ItemInfo {
2020
mass = 2.2;
2121
};
2222
};
2323

24-
class AMMO_CLASS(762x51_M81A1_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
25-
displayName = CESTRING(ammo,762x51_M81A1_20Rnd,name);
24+
class AMMO_CLASS(762x51_M80A1_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
25+
displayName = CESTRING(ammo,762x51_M80A1_20Rnd,name);
2626

2727
scope = 2;
2828

29-
greenmag_ammotype = QAMMO_CLASS(762x51_M81A1_1Rnd);
29+
greenmag_ammotype = QAMMO_CLASS(762x51_M80A1_1Rnd);
3030

3131
class ItemInfo : CBA_MiscItem_ItemInfo {
3232
mass = 4.4;
3333
};
3434
};
3535

36-
class AMMO_CLASS(762x51_M81A1_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
37-
displayName = CESTRING(ammo,762x51_M81A1_30Rnd,name);
36+
class AMMO_CLASS(762x51_M80A1_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
37+
displayName = CESTRING(ammo,762x51_M80A1_30Rnd,name);
3838

3939
scope = 2;
4040
scopeArsenal=2;
4141
scopeCurator=2;
4242

43-
greenmag_ammotype = QAMMO_CLASS(762x51_M81A1_1Rnd);
43+
greenmag_ammotype = QAMMO_CLASS(762x51_M80A1_1Rnd);
4444

4545
class ItemInfo : CBA_MiscItem_ItemInfo {
4646
mass = 6.6;
4747
};
4848
};
4949

50-
class AMMO_CLASS(762x51_M81A1_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
51-
displayName = CESTRING(ammo,762x51_M81A1_40Rnd,name);
50+
class AMMO_CLASS(762x51_M80A1_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
51+
displayName = CESTRING(ammo,762x51_M80A1_40Rnd,name);
5252

5353
scope = 2;
5454

55-
greenmag_ammotype = QAMMO_CLASS(762x51_M81A1_1Rnd);
55+
greenmag_ammotype = QAMMO_CLASS(762x51_M80A1_1Rnd);
5656

5757
class ItemInfo : CBA_MiscItem_ItemInfo {
5858
mass = 8.8;
5959
};
6060
};
6161

62-
class AMMO_CLASS(762x51_M81A1_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
63-
displayName = CESTRING(ammo,762x51_M81A1_50Rnd,name);
62+
class AMMO_CLASS(762x51_M80A1_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
63+
displayName = CESTRING(ammo,762x51_M80A1_50Rnd,name);
6464

6565
scope = 2;
6666

67-
greenmag_ammotype = QAMMO_CLASS(762x51_M81A1_1Rnd);
67+
greenmag_ammotype = QAMMO_CLASS(762x51_M80A1_1Rnd);
6868

6969
class ItemInfo : CBA_MiscItem_ItemInfo {
7070
mass = 11.0;
7171
};
7272
};
7373

74-
class AMMO_CLASS(762x51_M81A1_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
75-
displayName = CESTRING(ammo,762x51_M81A1_60Rnd,name);
74+
class AMMO_CLASS(762x51_M80A1_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
75+
displayName = CESTRING(ammo,762x51_M80A1_60Rnd,name);
7676

7777
scope = 2;
7878
scopeArsenal=2;
7979
scopeCurator=2;
8080

81-
greenmag_ammotype = QAMMO_CLASS(762x51_M81A1_1Rnd);
81+
greenmag_ammotype = QAMMO_CLASS(762x51_M80A1_1Rnd);
8282

8383
class ItemInfo : CBA_MiscItem_ItemInfo {
8484
mass = 13.2;

‎cvo_compats_common/greenmag/ammo/9x39_Basic.hpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
class AMMO_CLASS(9x39_basic_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2-
displayName = CESTRING(ammo,9x39_basic_1Rnd,name);
1+
class AMMO_CLASS(9x39_Basic_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2+
displayName = CESTRING(ammo,9x39_Basic_1Rnd,name);
33
picture = "\z\greenmag\addons\main\data\556mm.paa";
44

55
scope = 2;
@@ -9,76 +9,76 @@ class AMMO_CLASS(9x39_basic_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
99
};
1010
};
1111

12-
class AMMO_CLASS(9x39_basic_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
13-
displayName = CESTRING(ammo,9x39_basic_10Rnd,name);
12+
class AMMO_CLASS(9x39_Basic_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
13+
displayName = CESTRING(ammo,9x39_Basic_10Rnd,name);
1414

1515
scope = 2;
1616

17-
greenmag_ammotype = QAMMO_CLASS(9x39_basic_1Rnd);
17+
greenmag_ammotype = QAMMO_CLASS(9x39_Basic_1Rnd);
1818

1919
class ItemInfo : CBA_MiscItem_ItemInfo {
2020
mass = 4.9;
2121
};
2222
};
2323

24-
class AMMO_CLASS(9x39_basic_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
25-
displayName = CESTRING(ammo,9x39_basic_20Rnd,name);
24+
class AMMO_CLASS(9x39_Basic_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
25+
displayName = CESTRING(ammo,9x39_Basic_20Rnd,name);
2626

2727
scope = 2;
2828

29-
greenmag_ammotype = QAMMO_CLASS(9x39_basic_1Rnd);
29+
greenmag_ammotype = QAMMO_CLASS(9x39_Basic_1Rnd);
3030

3131
class ItemInfo : CBA_MiscItem_ItemInfo {
3232
mass = 9.8;
3333
};
3434
};
3535

36-
class AMMO_CLASS(9x39_basic_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
37-
displayName = CESTRING(ammo,9x39_basic_30Rnd,name);
36+
class AMMO_CLASS(9x39_Basic_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
37+
displayName = CESTRING(ammo,9x39_Basic_30Rnd,name);
3838

3939
scope = 2;
4040
scopeArsenal=2;
4141
scopeCurator=2;
4242

43-
greenmag_ammotype = QAMMO_CLASS(9x39_basic_1Rnd);
43+
greenmag_ammotype = QAMMO_CLASS(9x39_Basic_1Rnd);
4444

4545
class ItemInfo : CBA_MiscItem_ItemInfo {
4646
mass = 14.7;
4747
};
4848
};
4949

50-
class AMMO_CLASS(9x39_basic_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
51-
displayName = CESTRING(ammo,9x39_basic_40Rnd,name);
50+
class AMMO_CLASS(9x39_Basic_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
51+
displayName = CESTRING(ammo,9x39_Basic_40Rnd,name);
5252

5353
scope = 2;
5454

55-
greenmag_ammotype = QAMMO_CLASS(9x39_basic_1Rnd);
55+
greenmag_ammotype = QAMMO_CLASS(9x39_Basic_1Rnd);
5656

5757
class ItemInfo : CBA_MiscItem_ItemInfo {
5858
mass = 19.6;
5959
};
6060
};
6161

62-
class AMMO_CLASS(9x39_basic_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
63-
displayName = CESTRING(ammo,9x39_basic_50Rnd,name);
62+
class AMMO_CLASS(9x39_Basic_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
63+
displayName = CESTRING(ammo,9x39_Basic_50Rnd,name);
6464

6565
scope = 2;
6666

67-
greenmag_ammotype = QAMMO_CLASS(9x39_basic_1Rnd);
67+
greenmag_ammotype = QAMMO_CLASS(9x39_Basic_1Rnd);
6868

6969
class ItemInfo : CBA_MiscItem_ItemInfo {
7070
mass = 24.5;
7171
};
7272
};
7373

74-
class AMMO_CLASS(9x39_basic_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
75-
displayName = CESTRING(ammo,9x39_basic_60Rnd,name);
74+
class AMMO_CLASS(9x39_Basic_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
75+
displayName = CESTRING(ammo,9x39_Basic_60Rnd,name);
7676

7777
scope = 2;
7878
scopeArsenal=2;
7979
scopeCurator=2;
8080

81-
greenmag_ammotype = QAMMO_CLASS(9x39_basic_1Rnd);
81+
greenmag_ammotype = QAMMO_CLASS(9x39_Basic_1Rnd);
8282

8383
class ItemInfo : CBA_MiscItem_ItemInfo {
8484
mass = 29.4;

‎cvo_compats_common/greenmag/belts/556x45_M995.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class CVO_AFRF_greenmag_CoreBelt_556x45_M995 : CVO_GreenMag_Belt_Core {
33

44
greenmag_item = QBELT_CLASS(556x45_M995);
55
greenmag_basicammo = "greenmag_ammo_556x45_basic_1Rnd";
6-
greenmag_ammo = QAMMO_CLASS(556x45_M995_1Rnd);
6+
greenmag_ammo = "greenmag_ammo_556x45_m995ap_1Rnd";
77
greenmag_typeName = "556x45_M995";
88

99
class ItemInfo : CBA_MiscItem_ItemInfo {

‎cvo_compats_common/greenmag/config.cpp‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include "\cvo\compats\cvo_compats_common\greenmag\macros.hpp"
1+
#include "macros_greenmag.hpp"
22

3-
#if GREENMAG_LOADED
3+
//#if GREENMAG_LOADED
44
class CfgPatches {
55
class CVO_Compats_Common_GreenMag {
66
addonRootClass = "CVO_Compats_Common";
@@ -224,21 +224,6 @@ class CfgPatches {
224224
};
225225
};
226226

227-
class CfgMagazines {
228-
// External Classes
229-
class CA_Magazine;
230-
231-
#include "magazines\rhs_afrf_545x39.hpp"
232-
#include "magazines\rhs_afrf_762x39.hpp"
233-
#include "magazines\rhs_afrf_762x54.hpp"
234-
#include "magazines\rhs_afrf_9x19.hpp"
235-
#include "magazines\rhs_afrf_9x18.hpp"
236-
#include "magazines\rhs_afrf_9x21.hpp"
237-
#include "magazines\rhs_afrf_9x39.hpp"
238-
#include "magazines\rhs_afrf_338.hpp"
239-
240-
};
241-
242227
class CfgWeapons {
243228
// External Classes
244229
class CBA_MiscItem;
@@ -354,9 +339,9 @@ class CfgWeapons {
354339
#include "ammo\765x17_Basic.hpp"
355340

356341
// 7.92x57 Mauser
357-
#include "ammo\7.92x57_Basic.hpp"
358-
#include "ammo\7.92x57_M70.hpp"
359-
#include "ammo\7.92x57_M75.hpp"
342+
#include "ammo\792x57_Basic.hpp"
343+
#include "ammo\792x57_M70.hpp"
344+
#include "ammo\792x57_M75.hpp"
360345

361346
// 8x22 Nambu
362347
#include "ammo\8x22_Basic.hpp"
@@ -393,4 +378,4 @@ class CfgWeapons {
393378
#include "belts\762x54_7T2.hpp"
394379

395380
};
396-
#endif
381+
//#endif

cvo_compats_common/greenmag/macros_common_greenmag.hpp renamed to cvo_compats_common/greenmag/macros_greenmag.hpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
#ifndef CVO_COMPAT_MACROS_COMMON_GREENMAG
2-
3-
#define CVO_COMPAT_MACROS_COMMON_GREENMAG
4-
5-
#include "\cvo\compats\cvo_compats_common\macros_common.hpp"
6-
7-
#define GREENMAG_LOADED __has_include("\z\greenmag\addons\main\script_component.hpp")
1+
#include "\cvo\compats\cvo_compats_common\macros.hpp"
82

93
#define AMMO_CLASS(CLNAME) DOUBLES(CVO_greenmag_ammo,CLNAME)
104
#define QAMMO_CLASS(CLNAME) QUOTE(AMMO_CLASS(CLNAME))
@@ -15,5 +9,3 @@
159
#define CESTRING(CLNAME) QUOTE(DOUBLES($STR_CVO_greenmag,CLNAME))
1610
#define CESTRING(PREFIX,CLNAME) QUOTE(TRIPLES($STR_CVO_greenmag,PREFIX,CLNAME))
1711
#define CESTRING(PREFIX,CLNAME,POSTFIX) QUOTE(QUADRUPLES($STR_CVO_greenmag,PREFIX,CLNAME,POSTFIX))
18-
19-
#endif

0 commit comments

Comments
 (0)