From 7a3be3a58e400879214c683e43d9df6bdfae7dd4 Mon Sep 17 00:00:00 2001
From: Robalo <rs@bzbit.com>
Date: Fri, 15 Jul 2016 22:43:51 +0300
Subject: [PATCH] Add JR muzzles to pistols and compatibility with APEX bipod

---
 addons/jr/cfgweapons.hpp  | 41 +++++++++++++++++++++++++++++++++++++++
 addons/jr/jr_classes.hpp  |  1 +
 addons/jr_prep/config.cpp | 29 +++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/addons/jr/cfgweapons.hpp b/addons/jr/cfgweapons.hpp
index 4251d0301..7b7e4b5e0 100644
--- a/addons/jr/cfgweapons.hpp
+++ b/addons/jr/cfgweapons.hpp
@@ -894,4 +894,45 @@ class CfgWeapons {
         };
     };
 
+    class Pistol;
+
+    class Pistol_Base_F : Pistol {
+        class WeaponSlotsInfo;
+    };
+
+    class hgun_ACPC2_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            class MuzzleSlot : asdg_MuzzleSlot_45ACP {
+                iconPosition[] = {0.25, 0.4};
+                iconScale = 0.2;
+            };
+        };
+   };
+
+    class hgun_P07_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            class MuzzleSlot : asdg_MuzzleSlot_9MM {
+                iconPosition[] = {0.24, 0.35};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class hgun_Pistol_heavy_01_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            class MuzzleSlot : asdg_MuzzleSlot_45ACP {
+                iconPosition[] = {0.24, 0.35};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class hgun_Rook40_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            class MuzzleSlot : asdg_MuzzleSlot_9MM {
+                iconPosition[] = {0.3, 0.38};
+                iconScale = 0.2;
+            };
+        };
+    };
 };
diff --git a/addons/jr/jr_classes.hpp b/addons/jr/jr_classes.hpp
index 1590482f0..56593bb92 100644
--- a/addons/jr/jr_classes.hpp
+++ b/addons/jr/jr_classes.hpp
@@ -46,6 +46,7 @@ class asdg_UnderSlot: asdg_SlotInfo { // Base under barrel slot
         bipod_02_F_hex = 1;
         bipod_03_F_blk = 1;
         bipod_03_F_oli = 1;
+        bipod_01_F_khk = 1;
     };
 };
 
diff --git a/addons/jr_prep/config.cpp b/addons/jr_prep/config.cpp
index 17c119a62..44e2d9684 100644
--- a/addons/jr_prep/config.cpp
+++ b/addons/jr_prep/config.cpp
@@ -212,4 +212,33 @@ class CfgWeapons {
         };
     };
 
+    class Pistol;
+
+    class Pistol_Base_F : Pistol {
+        class WeaponSlotsInfo;
+    };
+
+    class hgun_ACPC2_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+   };
+
+    class hgun_P07_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class hgun_Pistol_heavy_01_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class hgun_Rook40_F : Pistol_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
 };