From 61f38fc259ec82aacaee703041ad2a0eacbe502f Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Sun, 18 Sep 2016 14:58:35 -0400
Subject: [PATCH] Use number instead of string for weapon slot type in configs

This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
---
 SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp          | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp            | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp            | 4 ++--
 SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp             | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp       | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/AS50.hpp     | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/Anzio_20.hpp | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/KSVK.hpp     | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M107.hpp     | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp
index a2ee6092e..f47718356 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp
@@ -62,5 +62,5 @@ class L110A1_DZ : L110A1_CCO_DZ
 };
 
 class BAF_L110A1_Aim_DZE:BAF_L110A1_Aim { //Slightly different scope from L110A1_CCO_DZ, otherwise identical
-	type = "1";
+	type = WeaponSlotPrimary;
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp
index e96a59acc..a3eb97d6a 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp
@@ -51,5 +51,5 @@ class M240_Holo_DZ : M240_CCO_DZ
 };
 
 class m240_scoped_EP1_DZE:m240_scoped_EP1 { //has m145 scope
-	type = "1";
+	type = WeaponSlotPrimary;
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp
index 0fd89af02..4e6abd374 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp
@@ -63,10 +63,10 @@ class M249_Holo_DZ : M249_CCO_DZ
 
 class M249_EP1;
 class M249_EP1_DZ:M249_EP1 { //Iron sight with shorter stock (slightly different look from M249_DZ) can also fire MG36 mags
-	type = "1";
+	type = WeaponSlotPrimary;
 };
 
 class M249_m145_EP1;
 class M249_m145_EP1_DZE:M249_m145_EP1 {
-	type = "1";
+	type = WeaponSlotPrimary;
 };
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp
index c5fa93f07..b4a0a0bd2 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp
@@ -20,5 +20,5 @@ class PKM_DZ : PK //Iron sight PKM
 };
 
 class Pecheneg_DZ: Pecheneg { //PKP with long range scope
-	type = "1";
+	type = WeaponSlotPrimary;
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp
index 3e8052e96..955ce4731 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp
@@ -1,4 +1,4 @@
 class M60A4_EP1;
 class M60A4_EP1_DZE : M60A4_EP1 {
-    type = "1";
+    type = WeaponSlotPrimary;
 };
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/AS50.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/AS50.hpp
index 8d2e75d6a..833086aa9 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/AS50.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/AS50.hpp
@@ -1,7 +1,7 @@
 class BAF_AS50_scoped;
 class BAF_AS50_scoped_DZ : BAF_AS50_scoped {
 	displayname = "AS50_DZ";
-	type = "1";
+	type = WeaponSlotPrimary;
 	canlock = 0;
 	//cursor = "RifleCursor";
 	//cursoraim = "Foresight";
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/Anzio_20.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/Anzio_20.hpp
index 1dbf130a7..447e66a6e 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/Anzio_20.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/Anzio_20.hpp
@@ -1,4 +1,4 @@
 class Anzio_20;
 class Anzio_20_DZ : Anzio_20 {
-	type = 1;
+	type = WeaponSlotPrimary;
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/KSVK.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/KSVK.hpp
index b617d8f52..93ccab818 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/KSVK.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/KSVK.hpp
@@ -1,4 +1,4 @@
 class ksvk;
 class KSVK_DZE:ksvk {
-    type = "1";
+    type = WeaponSlotPrimary;
 };
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M107.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M107.hpp
index f41b117e1..efa24683a 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M107.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M107.hpp
@@ -1,7 +1,7 @@
 class m107: Rifle
 {
 	scope = public;
-	type = 1;
+	type = WeaponSlotPrimary;
 	canlock = 0;
 	picture = "\CA\weapons\data\Equip\W_m107_CA.paa";
 	UiPicture = "\CA\weapons\data\Ico\i_sniper_CA.paa";