From 040f4a92a056f826d177ff84adebf20eec4a0f4e Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Fri, 10 Jul 2015 21:39:35 -0500
Subject: [PATCH] #1696 - Flashbangs make big boom

---
 addons/grenades/functions/fnc_flashbangExplosionEH.sqf | 8 ++++----
 addons/hearing/functions/fnc_firedNear.sqf             | 2 +-
 addons/hearing/script_component.hpp                    | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
index 50dc7cd288..a98fbc2350 100644
--- a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
+++ b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
@@ -40,7 +40,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
                     [_unit, false] call EFUNC(common,disableAI);
                 };
                 _unit setSkill (skill _unit * 50);
-            }, [_x], (7 * _strength), 0.1] call EFUNC(common,waitAndExecute);  //0.1 precision is fine for AI
+            }, [_x], (7 * _strength)] call EFUNC(common,waitAndExecute);
         } else {
             //Do effects for player
             // is there line of sight to the grenade?
@@ -62,7 +62,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
 
             //Add ace_hearing ear ringing sound effect
             if ((isClass (configFile >> "CfgPatches" >> "ACE_Hearing")) && {_strength > 0}) then {
-                [_x, 0.5 + (_strength / 2)] call EFUNC(hearing,earRinging);
+                [_x, (20 * _strength)] call EFUNC(hearing,earRinging);
             };
 
             // account for people looking away by slightly
@@ -95,7 +95,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
             [{
                 PARAMS_1(_light);
                 deleteVehicle _light;
-            }, [_light], 0.1, 0] call EFUNC(common,waitAndExecute);
+            }, [_light], 0.1] call EFUNC(common,waitAndExecute);
 
             // blind player
             if (_strength > 0.1) then {
@@ -113,7 +113,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
                 //FULLRECOVERY - end effect
                 [{
                     GVAR(flashbangPPEffectCC) ppEffectEnable false;
-                }, [], (17 * _strength), 0] call EFUNC(common,waitAndExecute);
+                }, [], (17 * _strength)] call EFUNC(common,waitAndExecute);
             };
         };
     };
diff --git a/addons/hearing/functions/fnc_firedNear.sqf b/addons/hearing/functions/fnc_firedNear.sqf
index de56f93945..d42e1ee308 100644
--- a/addons/hearing/functions/fnc_firedNear.sqf
+++ b/addons/hearing/functions/fnc_firedNear.sqf
@@ -68,7 +68,7 @@ if (count _weaponMagazines == 0) then {
 
 _magazine = "";
 {
-    EXPLODE_2_PVT(_x,_magazineType,_ammoType)
+    EXPLODE_2_PVT(_x,_magazineType,_ammoType);
     if (_ammoType == _ammo) exitWith {
         _magazine = _magazineType;
     };
diff --git a/addons/hearing/script_component.hpp b/addons/hearing/script_component.hpp
index 089bce86eb..194e150375 100644
--- a/addons/hearing/script_component.hpp
+++ b/addons/hearing/script_component.hpp
@@ -1,6 +1,8 @@
 #define COMPONENT hearing
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+
 #ifdef DEBUG_ENABLED_HEARING
     #define DEBUG_MODE_FULL
 #endif