From 709916c0f3dfec70c6b4131b2f01972be612b1f0 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Thu, 19 May 2016 19:53:23 -0500
Subject: [PATCH] Fix UBC errors for RHS 4.1 (#3800)

---
 optionals/compat_rhs_afrf3/CfgAmmo.hpp     | 2 +-
 optionals/compat_rhs_afrf3/CfgVehicles.hpp | 4 ++--
 optionals/compat_rhs_usf3/CfgAmmo.hpp      | 3 ++-
 optionals/compat_rhs_usf3/CfgWeapons.hpp   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp
index 3a00fdea68..0ab559f96c 100644
--- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp
+++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp
@@ -39,7 +39,7 @@ class CfgAmmo {
         ACE_muzzleVelocities[]={700, 800, 820, 833};
         ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
     };
-    class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball {
+    class rhs_B_762x54_Ball_Tracer_Green: rhs_B_762x54_Ball {
         ACE_caliber=7.925;
         ACE_bulletLength=28.956;
         ACE_bulletMass=9.6552;
diff --git a/optionals/compat_rhs_afrf3/CfgVehicles.hpp b/optionals/compat_rhs_afrf3/CfgVehicles.hpp
index 87d8673cd8..34effc0a58 100644
--- a/optionals/compat_rhs_afrf3/CfgVehicles.hpp
+++ b/optionals/compat_rhs_afrf3/CfgVehicles.hpp
@@ -243,8 +243,8 @@ class CfgVehicles {
         EGVAR(fastroping,onPrepare) = QFUNC(onPrepare);
 
         class UserActions {
-            class openDoor;
-            class closeDoor_L: openDoor {
+            class openDoor_L;
+            class closeDoor_L: openDoor_L {
                 condition = QUOTE((this doorPhase 'LeftDoor' > 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])});
             };
         };
diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp
index b830d5e564..930976bf33 100644
--- a/optionals/compat_rhs_usf3/CfgAmmo.hpp
+++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp
@@ -2,7 +2,8 @@
 class CfgAmmo
 {
     class BulletBase;
-    class rhsusf_B_300winmag: BulletBase {
+    class B_762x54_Ball;
+    class rhsusf_B_300winmag: B_762x54_Ball {
         ACE_caliber=7.823;
         ACE_bulletLength=37.821;
         ACE_bulletMass=14.256;
diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
index c49b9bc5e4..8ef39bd666 100644
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -111,8 +111,8 @@ class CfgWeapons
             };
         };
     };
-    class rhs_weap_m4a1;
-    class rhs_weap_mk18: rhs_weap_m4a1 {
+    class rhs_weap_m4a1_blockII;
+    class rhs_weap_mk18: rhs_weap_m4a1_blockII {
         ACE_barrelTwist = 177.8;
         ACE_barrelLength = 261.62;
         ACE_Overheating_dispersion = 1;