From e6bf9204dcbc5d975df71d8e55b6d290d0e89364 Mon Sep 17 00:00:00 2001
From: Florian Kinder <Florian.Kinder@mcl.de>
Date: Fri, 31 Jan 2014 08:18:29 +0100
Subject: [PATCH] Split WeaponHolder

---
 .../CfgVehicles/DZE/LockboxStorage.hpp        | 12 +++
 .../Configs/CfgVehicles/DZE/TentStorage.hpp   | 34 ++++++++-
 .../Configs/CfgVehicles/DZE/VaultStorage.hpp  | 12 +++
 SQF/dayz_code/Configs/cfgVehicles.hpp         | 74 +------------------
 4 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
index f9be7e5ff..4bbd39c78 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
@@ -25,4 +25,16 @@ class LockboxStorage: Land_A_tent {
 	transportMaxBackpacks = 10;
 	lockedClass = "LockboxStorageLocked";
 	packedClass = "WeaponHolder_ItemLockbox";
+};
+
+class WeaponHolder;
+class WeaponHolder_ItemLockbox: WeaponHolder {
+	scope = 2;
+	displayName = "Lockbox";
+	class transportmagazines {
+		class _xx_ItemLockbox {
+			magazine = "ItemLockbox";
+			count = 1;
+		};
+	};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/TentStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/TentStorage.hpp
index 27a4dc708..5cc01b8c5 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/TentStorage.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/TentStorage.hpp
@@ -29,4 +29,36 @@ class TentStorageDomed2: TentStorage {
 	transportMaxBackpacks = 7;
 	create = "WeaponHolder_ItemTentDomed2";
 	offset[] = {0,2.5,0};
-};
\ No newline at end of file
+};
+
+class WeaponHolder;
+class WeaponHolder_ItemTentOld: WeaponHolder {
+	scope = 2;
+	displayName = $STR_EQUIP_NAME_20;
+	class transportmagazines {
+		class _xx_ItemTentOld {
+			magazine = "ItemTentOld";
+			count = 1;
+		};
+	};
+};
+class WeaponHolder_ItemTentDomed: WeaponHolder {
+	scope = 2;
+	displayName = "Domed Desert Tent";
+	class transportmagazines {
+		class _xx_ItemTentDomed {
+			magazine = "ItemTentDomed";
+			count = 1;
+		};
+	};
+};
+class WeaponHolder_ItemTentDomed2: WeaponHolder {
+	scope = 2;
+	displayName = "Domed Green Tent";
+	class transportmagazines {
+		class _xx_ItemTentDomed2 {
+			magazine = "ItemTentDomed2";
+			count = 1;
+		};
+	};
+};	
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
index c83030c93..87222f85c 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
@@ -27,4 +27,16 @@ class VaultStorageLocked: Land_A_tent {
 	unlockedClass = "VaultStorage";
 	requireplot = 0;
 	nounderground = 0;
+};
+
+class WeaponHolder;
+class WeaponHolder_ItemVault: WeaponHolder {
+	scope = 2;
+	displayName = "Safe";
+	class transportmagazines {
+		class _xx_ItemVault {
+			magazine = "ItemVault";
+			count = 1;
+		};
+	};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp
index eb7b368ef..f8210ba58 100644
--- a/SQF/dayz_code/Configs/cfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/cfgVehicles.hpp
@@ -2482,7 +2482,8 @@ class CfgVehicles {
 		transportRepair = 0;
 		transportFuel = 0;
 	};
-	class WoodenArrowF : WeaponHolderBase {
+	class WoodenArrowF : WeaponHolderBase
+	{
 		scope = public;
 		displayName = "Arrow";
 		model = "\dayz_weapons\models\bolt";
@@ -2491,7 +2492,6 @@ class CfgVehicles {
 			init = "[(_this select 0),'cfgMagazines','WoodenArrow'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
 		};
 	};
-	
 	class WeaponHolder_ItemHatchet_DZE: WeaponHolderBase
 	{
 		scope = 2;
@@ -2502,7 +2502,6 @@ class CfgVehicles {
 			init = "[(_this select 0),'cfgWeapons','ItemHatchet_DZE'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
 		};
 	};
-
 	class WeaponHolder_ItemMachete: WeaponHolderBase
 	{
 		scope = 2;
@@ -2523,75 +2522,6 @@ class CfgVehicles {
 			init = "[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
 		};
 	};
-
-	class WeaponHolder;
-
-	class WeaponHolder_ItemTentOld: WeaponHolder
-	{
-		scope = 2;
-		displayName = $STR_EQUIP_NAME_20;
-		class transportmagazines
-		{
-			class _xx_ItemTentOld
-			{
-				magazine = "ItemTentOld";
-				count = 1;
-			};
-		};
-	};
-	class WeaponHolder_ItemTentDomed: WeaponHolder
-	{
-		scope = 2;
-		displayName = "Domed Desert Tent";
-		class transportmagazines
-		{
-			class _xx_ItemTentDomed
-			{
-				magazine = "ItemTentDomed";
-				count = 1;
-			};
-		};
-	};
-	class WeaponHolder_ItemTentDomed2: WeaponHolder
-	{
-		scope = 2;
-		displayName = "Domed Green Tent";
-		class transportmagazines
-		{
-			class _xx_ItemTentDomed2
-			{
-				magazine = "ItemTentDomed2";
-				count = 1;
-			};
-		};
-	};	
-	
-	class WeaponHolder_ItemVault: WeaponHolder
-	{
-		scope = 2;
-		displayName = "Safe";
-		class transportmagazines
-		{
-			class _xx_ItemVault
-			{
-				magazine = "ItemVault";
-				count = 1;
-			};
-		};
-	};
-	class WeaponHolder_ItemLockbox: WeaponHolder
-	{
-		scope = 2;
-		displayName = "Lockbox";
-		class transportmagazines
-		{
-			class _xx_ItemLockbox
-			{
-				magazine = "ItemLockbox";
-				count = 1;
-			};
-		};
-	};
 	class WeaponHolder_ItemJerrycanEmpty: WeaponHolderBase
 	{
 		scope = 2;