From b54a5463ee200de8850cabb97c3c44f43f8ac084 Mon Sep 17 00:00:00 2001
From: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Date: Sun, 16 Jul 2023 20:27:09 +0300
Subject: [PATCH] RHS Compat - Improve macro usage (#9262)

* macro usage, swap barrel on PKP

* revert barrel swap
---
 optionals/compat_rhs_afrf3/CfgWeapons.hpp |  2 +-
 optionals/compat_rhs_gref3/CfgWeapons.hpp |  4 ++--
 optionals/compat_rhs_saf3/CfgWeapons.hpp  |  2 +-
 optionals/compat_rhs_usf3/CfgWeapons.hpp  | 13 ++++++-------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
index 5db253f68b..4435846ac0 100644
--- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
@@ -79,7 +79,7 @@ class CfgWeapons {
         ACE_barrelLength = 657.86;
     };
     class rhs_weap_pkm: rhs_weap_pkp {
-        ACE_Overheating_allowSwapBarrel = 1;
+        EGVAR(overheating,allowSwapBarrel) = 1;
         ACE_barrelTwist = 240.03;
         ACE_barrelLength = 645.16;
     };
diff --git a/optionals/compat_rhs_gref3/CfgWeapons.hpp b/optionals/compat_rhs_gref3/CfgWeapons.hpp
index 9ef0896409..823bf1cc5a 100644
--- a/optionals/compat_rhs_gref3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_gref3/CfgWeapons.hpp
@@ -109,11 +109,11 @@ class CfgWeapons {
     };
 
     class rhs_weap_Izh18: Rifle_Base_F {
-        ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"};
+        EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
     };
 
     class rhs_weap_m79: Rifle_Base_F {
-        ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"};
+        EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
     };
 
     CREATE_CSW_PROXY(rhs_weap_DSHKM);
diff --git a/optionals/compat_rhs_saf3/CfgWeapons.hpp b/optionals/compat_rhs_saf3/CfgWeapons.hpp
index 1aed727715..3293514e38 100644
--- a/optionals/compat_rhs_saf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_saf3/CfgWeapons.hpp
@@ -56,7 +56,7 @@ class CfgWeapons {
     class rhs_weap_m84: Rifle_Long_Base_F {
         ACE_barrelLength = 658;
         ACE_barrelTwist = 240;
-        ACE_Overheating_allowSwapBarrel = 1;
+        EGVAR(overheating,allowSwapBarrel) = 1;
     };
 
     class hgun_P07_F;
diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
index 64e093f6ba..88cbbc84a9 100644
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -23,7 +23,7 @@ class CfgWeapons {
     class rhs_weap_XM2010_Base_F: Rifle_Base_F {
         ACE_barrelTwist = 254.0;
         ACE_barrelLength = 609.6;
-        ACE_Overheating_dispersion = 0.75;
+        EGVAR(overheating,dispersion) = 0.75;
         ACE_RailHeightAboveBore = 3.1028;
     };
     class rhs_weap_m24sws: rhs_weap_XM2010_Base_F {
@@ -96,24 +96,23 @@ class CfgWeapons {
         ACE_RailHeightAboveBore = 4.3987;
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 629.92;
-        ACE_Overheating_allowSwapBarrel = 1;
     };
     class rhs_weap_m14_base;
     class rhs_weap_m14: rhs_weap_m14_base {
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 558.8;
-        ACE_Overheating_dispersion = 0.75;
+        EGVAR(overheating,dispersion) = 0.75;
     };
     class rhs_weap_m14ebrri: rhs_weap_m14ebrri_base {
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 558.8;
-        ACE_Overheating_dispersion = 0.75;
+        EGVAR(overheating,dispersion) = 0.75;
         ACE_RailHeightAboveBore = 3.08341;
     };
     class rhs_weap_m14_socom_base: rhs_weap_m14_base {
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 413; //16.25 in (413 mm)
-        ACE_Overheating_dispersion = 0.75;
+        EGVAR(overheating,dispersion) = 0.75;
     };
     class rhs_weap_sr25: rhs_weap_m14ebrri {
         ACE_barrelTwist = 285.75;
@@ -158,7 +157,7 @@ class CfgWeapons {
         ACE_barrelLength = 508.0;
     };
     class rhs_weap_m32_Base_F: Rifle_Base_F {
-        ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"};
+        EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
     };
     class SMG_02_base_F;
     class rhsusf_weap_MP7A1_base_f: SMG_02_base_F {
@@ -184,7 +183,7 @@ class CfgWeapons {
         ACE_barrelLength = 124.46;
     };
     class rhs_weap_M320_Base_F: Pistol_Base_F {
-        ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"};
+        EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
     };
 
     // RHS sniper scopes