Fixed throw

DayZMod · Dec 16, 2015 · 8f6adec · 8f6adec
1 parent edccfdd
commit 8f6adec
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 67 deletions.
diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
@@ -15,25 +15,11 @@ class CfgWeapons
 	class Pistol;
 	class GrenadeLauncher;
 
-	class Throw : GrenadeLauncher
-	{
-		autoReload = true;
-		backgroundReload = true;
-
-		class ThrowMuzzle : GrenadeLauncher
-		{
-			cursor = "\ca\Weapons\Data\clear_empty";
-			backgroundReload = true;
-		};
-	};
 
 
-
-	/* **** DUMMY WEAPONS **** */
-	#include "Loot.hpp"
+	/* Dummy weapons */
 	#include "Throw.hpp"
-
-
+	#include "Loot.hpp"
 
 
 

diff --git a/SQF/dayz_code/Configs/CfgWeapons/Throw.hpp b/SQF/dayz_code/Configs/CfgWeapons/Throw.hpp
@@ -1,78 +1,89 @@
-class Throw_DZ : Throw
+class Throw : GrenadeLauncher
 {
-	scope = public;
+	autoReload = true;
+	backgroundReload = true;
+
 	muzzles[] =
 	{
-		"RoadFlareMuzzle",
-		"ChemLightMuzzle",
-		"TrashMuzzle"
+		HandGrenadeMuzzle,
+		SmokeShellMuzzle,
+
+		RoadFlareMuzzle,
+		ChemLightMuzzle,
+		TrashMuzzle
+	};
+
+	class ThrowMuzzle : GrenadeLauncher
+	{
+		cursor = "\ca\Weapons\Data\clear_empty";
+		backgroundReload = true;
 	};
 
 	class RoadFlareMuzzle : ThrowMuzzle
 	{
 		displayName = $STR_MAG_ACTION_4;
-		magazines[] = {"HandRoadFlare"};
+		magazines[] = {HandRoadFlare};
 
 		begin1[] = {"dayz_weapons\sounds\roadflare_start", 1.77828, 1, 1000};
-		soundBegin[] = {"begin1", 1};
+		soundBegin[] = {begin1, 1};
 	};
 
 	class ChemLightMuzzle : ThrowMuzzle
 	{
 		displayName = $STR_MAG_ACTION_5;
-		magazines[] = {"HandChemGreen", "HandChemRed", "HandChemBlue"};
+		magazines[] = {HandChemGreen, HandChemRed, HandChemBlue};
 	};
 
 	class TrashMuzzle : ThrowMuzzle
 	{
 		displayName = $STR_ACTION_THROW;
 		magazines[] =
 		{
-			"TrashJackDaniels",
+			TrashJackDaniels,
 
-			"TrashTinCan",
-			"FoodCanGriffEmpty",
-			"FoodCanBadguyEmpty",
-			"FoodCanBoneboyEmpty",
-			"FoodCanCornEmpty",
-			"FoodCanCurgonEmpty",
-			"FoodCanDemonEmpty",
-			"FoodCanFraggleosEmpty",
-			"FoodCanHerpyEmpty",
-			"FoodCanDerpyEmpty",
-			"FoodCanOrlokEmpty",
-			"FoodCanPowellEmpty",
-			"FoodCanTylersEmpty",
-			"FoodCanUnlabeledEmpty",
-			"FoodCanRusUnlabeledEmpty",
-			"FoodCanRusPorkEmpty",
-			"FoodCanRusPeasEmpty",
-			"FoodCanRusMilkEmpty",
-			"FoodCanRusCornEmpty",
-			"FoodCanRusStewEmpty",
-			"FoodCanBeefEmpty",
-			"FoodCanPotatoesEmpty",
+			TrashTinCan,
+			FoodCanGriffEmpty,
+			FoodCanBadguyEmpty,
+			FoodCanBoneboyEmpty,
+			FoodCanCornEmpty,
+			FoodCanCurgonEmpty,
+			FoodCanDemonEmpty,
+			FoodCanFraggleosEmpty,
+			FoodCanHerpyEmpty,
+			FoodCanDerpyEmpty,
+			FoodCanOrlokEmpty,
+			FoodCanPowellEmpty,
+			FoodCanTylersEmpty,
+			FoodCanUnlabeledEmpty,
+			FoodCanRusUnlabeledEmpty,
+			FoodCanRusPorkEmpty,
+			FoodCanRusPeasEmpty,
+			FoodCanRusMilkEmpty,
+			FoodCanRusCornEmpty,
+			FoodCanRusStewEmpty,
+			FoodCanBeefEmpty,
+			FoodCanPotatoesEmpty,
 
-			"ItemSodaEmpty",
-			"ItemSodaClaysEmpty",
-			"ItemSodaCokeEmpty",
-			"ItemSodaDrwasteEmpty",
-			"ItemSodaFrankaEmpty",
-			"ItemSodaGrapeDrinkEmpty",
-			"ItemSodaLemonadeEmpty",
-			"ItemSodaLirikEmpty",
-			"ItemSodaLvgEmpty",
-			"ItemSodaMdewEmpty",
-			"ItemSodaMtngreenEmpty",
-			"ItemSodaMzlyEmpty",
-			"ItemSodaPeppsyEmpty",
-			"ItemSodaPepsiEmpty",
-			"ItemSodaR4z0rEmpty",
-			"ItemSodaRabbitEmpty",
-			"ItemSodaRocketFuelEmpty",
-			"ItemSodaSacriteEmpty",
-			"ItemSodaSherbetEmpty",
-			"ItemSodaSmashtEmpty"
+			ItemSodaEmpty,
+			ItemSodaClaysEmpty,
+			ItemSodaCokeEmpty,
+			ItemSodaDrwasteEmpty,
+			ItemSodaFrankaEmpty,
+			ItemSodaGrapeDrinkEmpty,
+			ItemSodaLemonadeEmpty,
+			ItemSodaLirikEmpty,
+			ItemSodaLvgEmpty,
+			ItemSodaMdewEmpty,
+			ItemSodaMtngreenEmpty,
+			ItemSodaMzlyEmpty,
+			ItemSodaPeppsyEmpty,
+			ItemSodaPepsiEmpty,
+			ItemSodaR4z0rEmpty,
+			ItemSodaRabbitEmpty,
+			ItemSodaRocketFuelEmpty,
+			ItemSodaSacriteEmpty,
+			ItemSodaSherbetEmpty,
+			ItemSodaSmashtEmpty
 		};
 	};
 };