From 4cce799ace5fcc1fb73265d8233370cffebac75a Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Mon, 10 Aug 2015 22:08:13 -0500
Subject: [PATCH] #2045 - Push SDV sub, cleanup push

---
 addons/interaction/CfgVehicles.hpp        |  4 ++--
 addons/interaction/XEH_postInit.sqf       |  7 +++++++
 addons/interaction/functions/fnc_push.sqf | 16 ++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 6a492b14ad..d3260fd577 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -501,8 +501,8 @@ class CfgVehicles {
                 class ACE_Push {
                     displayName = CSTRING(Push);
                     distance = 6;
-                    condition = QUOTE(getMass _target < 1000 && {alive _target});
-                    statement = QUOTE([ARR_2(_target, [ARR_3(2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5)])] call DFUNC(push););
+                    condition = QUOTE(((getMass _target) <= 2600) && {alive _target} && {(vectorMagnitude (velocity _target)) < 3});
+                    statement = QUOTE(_this call FUNC(push));
                     showDisabled = 0;
                     priority = -1;
                 };
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index 7fe151dac1..8db2d34ad1 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -10,6 +10,13 @@ ACE_Modifier = 0;
     _group selectLeader _leader;
 }] call EFUNC(common,addEventHandler);
 
+//Pushing boats from FUNC(push)
+[QGVAR(pushBoat), {
+    params ["_boat", "_newVelocity"];
+    _boat setVelocity _newVelocity;
+}] call EFUNC(common,addEventHandler);
+
+
 if (!hasInterface) exitWith {};
 
 GVAR(isOpeningDoor) = false;
diff --git a/addons/interaction/functions/fnc_push.sqf b/addons/interaction/functions/fnc_push.sqf
index 946a5118be..86ad673d9c 100644
--- a/addons/interaction/functions/fnc_push.sqf
+++ b/addons/interaction/functions/fnc_push.sqf
@@ -4,23 +4,23 @@
  *
  * Arguments:
  * 0: Boat <OBJECT>
- * 1: Velocity <ARRAY>
+ * 1: Player <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * [target, [vector]] call ace_interaction_fnc_push
+ * [Boats, Jose] call ace_interaction_fnc_push
  *
  * Public: No
  */
- 
+
 #include "script_component.hpp"
 
-PARAMS_2(_boat,_velocity);
+params ["_boat", "_player"];
 
-if !(local _boat) exitWith {
-    [_this, QUOTE(FUNC(push)), _boat] call EFUNC(common,execRemoteFnc);
-};
+private ["_newVelocity"];
 
-_boat setVelocity _velocity;
+_newVelocity = [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5];
+
+[QGVAR(pushBoat), [_boat], [_boat, _newVelocity]] call EFUNC(common,targetEvent);