From 581c64f66faa324cb1ec0382aae51401f65438ab Mon Sep 17 00:00:00 2001
From: Glowbal <thomasskooi@live.nl>
Date: Wed, 29 Apr 2015 23:12:47 +0200
Subject: [PATCH] Implemented unloading from vehicles #740

---
 addons/interaction/CfgVehicles.hpp | 36 ++++++++++++++++++++++++++++++
 addons/medical/CfgVehicles.hpp     |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index f6f39808b9..96165d63e3 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -398,6 +398,12 @@ class CfgVehicles {
         selection = "";
         distance = 10;
         condition = "true";
+        class ACE_Passengers {
+          displayName = "$STR_ACE_Interaction_Passengers";
+          condition = "true";
+          statement = "";
+          insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+        };
       };
     };
     class ACE_SelfActions {
@@ -416,6 +422,12 @@ class CfgVehicles {
         selection = "";
         distance = 10;
         condition = "true";
+        class ACE_Passengers {
+          displayName = "$STR_ACE_Interaction_Passengers";
+          condition = "true";
+          statement = "";
+          insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+        };
       };
     };
     class ACE_SelfActions {
@@ -436,6 +448,12 @@ class CfgVehicles {
         selection = "";
         distance = 10;
         condition = "true";
+        class ACE_Passengers {
+          displayName = "$STR_ACE_Interaction_Passengers";
+          condition = "true";
+          statement = "";
+          insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+        };
       };
     };
     class ACE_SelfActions {
@@ -454,6 +472,12 @@ class CfgVehicles {
         selection = "";
         distance = 10;
         condition = "true";
+        class ACE_Passengers {
+          displayName = "$STR_ACE_Interaction_Passengers";
+          condition = "true";
+          statement = "";
+          insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+        };
       };
     };
     class ACE_SelfActions {
@@ -483,6 +507,12 @@ class CfgVehicles {
           showDisabled = 0;
           priority = -1;
         };
+        class ACE_Passengers {
+          displayName = "$STR_ACE_Interaction_Passengers";
+          condition = "true";
+          statement = "";
+          insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+        };
       };
     };
     class ACE_SelfActions {
@@ -502,6 +532,12 @@ class CfgVehicles {
         selection = "gunnerview";
         distance = 2;
         condition = "true";
+        class ACE_Passengers {
+          displayName = "$STR_ACE_Interaction_Passengers";
+          condition = "true";
+          statement = "";
+          insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+        };
       };
     };
     class ACE_SelfActions {
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index f28322baf7..179daae742 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -446,7 +446,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical";
                     runOnHover = 1;
                     exceptions[] = {"isNotInside"};
-                    condition = QUOTE(vehicle _target != _target);
+                    condition = QUOTE(vehicle _target != _target && vehicle _target == vehicle _player);
                     statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
                     icon = PATHTOF(UI\icons\medical_cross.paa);