From ce4cdd372220a6861fae0c157adac3faa9d8f2b8 Mon Sep 17 00:00:00 2001
From: Glowbal <thomasskooi@live.nl>
Date: Mon, 6 Apr 2015 15:11:54 +0200
Subject: [PATCH] staged bodybag fixes

---
 addons/medical/CfgEventHandlers.hpp                   | 4 ++--
 addons/medical/CfgVehicles.hpp                        | 3 ++-
 addons/medical/config.cpp                             | 2 +-
 addons/medical/functions/fnc_actionPlaceInBodyBag.sqf | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/medical/CfgEventHandlers.hpp b/addons/medical/CfgEventHandlers.hpp
index 016952a4de..bf96b6a239 100644
--- a/addons/medical/CfgEventHandlers.hpp
+++ b/addons/medical/CfgEventHandlers.hpp
@@ -17,9 +17,9 @@ class Extended_Init_EventHandlers {
             init = QUOTE(call COMPILE_FILE(XEH_init));
         };
     };
-    class ACE_bodyBag {
+    class ACE_bodyBagObject {
         class ADDON {
-            init = QUOTE(_this call EDFUNC(dragging,initObject));
+            init = QUOTE(_this call DEFUNC(dragging,initObject));
         };
     };
 };
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index e966b2d5d8..dc0c982a09 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -613,7 +613,8 @@ class CfgVehicles {
         };
     };
     class MapBoard_altis_F;
-    class ACE_bodyBag: MapBoard_altis_F {
+    class ACE_bodyBagObject: MapBoard_altis_F {
+        XEH_ENABLED;
         scope = 1;
         side = -1;
         model = QUOTE(PATHTOF(data\bodybag.p3d));
diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index 28e07fe4d4..a5f00bbeed 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -2,7 +2,7 @@
 
 class CfgPatches {
     class ADDON {
-        units[] = {"ACE_medicalSupplyCrate", "ACE_fieldDressingItem", "ACE_packingBandageItem", "ACE_elasticBandageItem", "ACE_tourniquetItem", "ACE_morphineItem", "ACE_atropineItem", "ACE_epinephrineItem", "ACE_plasmaIVItem", "ACE_bloodIVItem", "ACE_salineIVItem", "ACE_quikclotItem", "ACE_personalAidKitItem", "ACE_surgicalKitItem", "ACE_bodyBagItem"};
+        units[] = {"ACE_medicalSupplyCrate", "ACE_fieldDressingItem", "ACE_packingBandageItem", "ACE_elasticBandageItem", "ACE_tourniquetItem", "ACE_morphineItem", "ACE_atropineItem", "ACE_epinephrineItem", "ACE_plasmaIVItem", "ACE_bloodIVItem", "ACE_salineIVItem", "ACE_quikclotItem", "ACE_personalAidKitItem", "ACE_surgicalKitItem", "ACE_bodyBagItem", "ACE_bodyBagObject"};
         weapons[] = {"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_tourniquet", "ACE_morphine", "ACE_atropine", "ACE_epinephrine", "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250", "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250", "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250", "ACE_quikclot", "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag"};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {ace_common, ace_interaction, ace_modules};
diff --git a/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf b/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
index aa08e8a8e9..872b9a628a 100644
--- a/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
+++ b/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
@@ -24,7 +24,7 @@ if (alive _target) then {
 };
 _onPosition = getPos _target;
 deleteVehicle _target;
-_bodyBagCreated = createVehicle ["ACE_bodyBag", _onPosition, [], 0, "NONE"];
+_bodyBagCreated = createVehicle ["ACE_bodyBagObject", _onPosition, [], 0, "NONE"];
 // reset the position to ensure it is on the correct one.
 _bodyBagCreated setPos [_onPosition select 0, _onPosition select 1, (_onPosition select 2) + 0.2];