From 44aaf3955b2f59fe18c346f784f4b614552af88b Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 15 Feb 2015 15:48:40 +0100
Subject: [PATCH] some backblast cleanup

---
 addons/backblast/CfgEventHandlers.hpp |  8 +++---
 addons/backblast/CfgWeapons.hpp       | 35 +++++++++++++++------------
 addons/backblast/config.cpp           |  3 +--
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/addons/backblast/CfgEventHandlers.hpp b/addons/backblast/CfgEventHandlers.hpp
index a336a5dd41..aaa0189b6d 100644
--- a/addons/backblast/CfgEventHandlers.hpp
+++ b/addons/backblast/CfgEventHandlers.hpp
@@ -7,11 +7,11 @@ class Extended_PreInit_EventHandlers {
 
 class Extended_FiredNear_EventHandlers {
     class CAManBase {
-        class GVAR(LauncherBackblast) {
-            FiredNear = QUOTE( if (local (_this select 0) && {getNumber (configfile >> 'CfgWeapons' >> _this select 3 >> 'ACE_Backblast_Damage') > 0}) then {_this call FUNC(launcherBackblast)} );
+        class ADDON {
+            firedNear = QUOTE(if (local (_this select 0) && {getNumber (configfile >> 'CfgWeapons' >> _this select 3 >> 'ACE_Backblast_Damage') > 0}) then {_this call DFUNC(launcherBackblast)});
         };
-        class GVAR(TankDangerZone) {
-            FiredNear = QUOTE( if (local (_this select 0) && {getNumber (configfile >> 'CfgWeapons' >> _this select 3 >> 'ACE_DangerZone_Damage') > 0}) then {_this call FUNC(tankDangerZone)} );
+        class ADDON {
+            firedNear = QUOTE(if (local (_this select 0) && {getNumber (configfile >> 'CfgWeapons' >> _this select 3 >> 'ACE_DangerZone_Damage') > 0}) then {_this call DFUNC(tankDangerZone)});
         };
     };
 };
diff --git a/addons/backblast/CfgWeapons.hpp b/addons/backblast/CfgWeapons.hpp
index fcb4bde0c5..f4f7c07153 100644
--- a/addons/backblast/CfgWeapons.hpp
+++ b/addons/backblast/CfgWeapons.hpp
@@ -1,33 +1,37 @@
+
 class CfgWeapons {
 
     class LauncherCore;
     class Launcher: LauncherCore {
-        ACE_Backblast_Angle = 60;
-        ACE_Backblast_Range = 10;
-        ACE_Backblast_Damage = 0.7;
+        GVAR(angle) = 60;
+        GVAR(range) = 10;
+        GVAR(damage) = 0.7;
     };
+
     class Launcher_Base_F: Launcher {};
 
     class launch_Titan_base: Launcher_Base_F {
-        ACE_Backblast_Angle = 40;
-        ACE_Backblast_Range = 8;
-        ACE_Backblast_Damage = 0.5;
+        GVAR(angle) = 40;
+        GVAR(range) = 8;
+        GVAR(damage) = 0.5;
     };
+
     class launch_Titan_short_base: launch_Titan_base {
-        ACE_Backblast_Angle = 40;
-        ACE_Backblast_Range = 8;
-        ACE_Backblast_Damage = 0.5;
+        GVAR(angle) = 40;
+        GVAR(range) = 8;
+        GVAR(damage) = 0.5;
     };
 
     class launch_NLAW_F: Launcher_Base_F {
-        ACE_Backblast_Angle = 40;
-        ACE_Backblast_Range = 5;
-        ACE_Backblast_Damage = 0.6;
+        GVAR(angle) = 40;
+        GVAR(range) = 5;
+        GVAR(damage) = 0.6;
     };
+
     class launch_RPG32_F: Launcher_Base_F {
-        ACE_Backblast_Angle = 60;
-        ACE_Backblast_Range = 15;
-        ACE_Backblast_Damage = 0.7;
+        GVAR(angle) = 60;
+        GVAR(range) = 15;
+        GVAR(damage) = 0.7;
     };
 
     class CannonCore;
@@ -36,6 +40,7 @@ class CfgWeapons {
         ACE_DangerZone_Range = 50;
         ACE_DangerZone_Damage = 0.85;
     };
+
     class mortar_155mm_AMOS: CannonCore {
         ACE_DangerZone_Angle = 90;
         ACE_DangerZone_Range = 60;
diff --git a/addons/backblast/config.cpp b/addons/backblast/config.cpp
index 88de936cf9..d4aaf8131b 100644
--- a/addons/backblast/config.cpp
+++ b/addons/backblast/config.cpp
@@ -6,12 +6,11 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
-        author[] = {"commy2", "KoffeinFlummi"};
+        author[] = {"commy2","KoffeinFlummi"};
         authorUrl = "https://github.com/commy2/";
         VERSION_CONFIG;
     };
 };
 
 #include "CfgEventHandlers.hpp"
-
 #include "CfgWeapons.hpp"