From 7bd2378c41bf6b6275ecd25e1755ec7bfed34393 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sat, 16 Apr 2016 12:54:33 -0500
Subject: [PATCH] Concertina Wire - Don't recoil broken wire, fix killer

Close #3695
- Don't recoil broken wire
- Use midpoint to search for nearby cars, and ensure the veh was moving.
---
 addons/concertina_wire/CfgVehicles.hpp                | 2 +-
 addons/concertina_wire/functions/fnc_handleKilled.sqf | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/concertina_wire/CfgVehicles.hpp b/addons/concertina_wire/CfgVehicles.hpp
index dd18c07209..88975ea7e9 100644
--- a/addons/concertina_wire/CfgVehicles.hpp
+++ b/addons/concertina_wire/CfgVehicles.hpp
@@ -86,7 +86,7 @@ class CfgVehicles {
                     selection = "";
                     displayName = "$STR_ACE_UNROLLWIRE";
                     distance = 5;
-                    condition = "true";
+                    condition = "alive _target";
                     statement = QUOTE([ARR_2(_target,_player)] call FUNC(dismount));
                     showDisabled = 0;
                     exceptions[] = {};
diff --git a/addons/concertina_wire/functions/fnc_handleKilled.sqf b/addons/concertina_wire/functions/fnc_handleKilled.sqf
index ac59798d10..1af3f93151 100644
--- a/addons/concertina_wire/functions/fnc_handleKilled.sqf
+++ b/addons/concertina_wire/functions/fnc_handleKilled.sqf
@@ -14,13 +14,17 @@
  */
 #include "script_component.hpp"
 params ["_wire", "_killer"];
+TRACE_2("params",_wire,_killer);
 
 private ["_distance", "_vehicle"];
 
 if (isNull _killer) then {
     _killer = _wire getVariable ["ace_concertina_wire_lastDamager", objNull];
     if (isNull _killer) then {
-        _killer = nearestObject [_wire, "car"];
+        private _midPoint = ((_wire selectionPosition "start") vectorAdd (_wire selectionPosition "deploy")) vectorMultiply 0.5;
+        {
+            if ((vectorMagnitude velocity _x) > 0) exitWith {_killer = _x};
+        } forEach (nearestObjects [(_wire modelToWorld _midPoint), ["Car"], 8]);
     };
 };
 if (isNull _killer || {_killer == _wire} || {_killer == gunner (vehicle _killer)}) exitWith {};