From f59e8920f9a3ff4f590ba6433ecb4992ceadf1fd Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Thu, 25 Feb 2016 13:59:00 -0600
Subject: [PATCH] Fix Mortar Display

---
 addons/mk6mortar/CfgEventHandlers.hpp                  | 6 ------
 addons/mk6mortar/XEH_postInit.sqf                      | 1 +
 addons/mk6mortar/functions/fnc_turretDisplayLoaded.sqf | 3 ++-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/mk6mortar/CfgEventHandlers.hpp b/addons/mk6mortar/CfgEventHandlers.hpp
index b88088c6e4..957fefb736 100644
--- a/addons/mk6mortar/CfgEventHandlers.hpp
+++ b/addons/mk6mortar/CfgEventHandlers.hpp
@@ -17,12 +17,6 @@ class Extended_PostInit_EventHandlers {
     };
 };
 
-class Extended_DisplayLoad_EventHandlers {
-    class RscUnitInfo {
-        ADDON = QUOTE(_this call FUNC(turretDisplayLoaded));
-    };
-};
-
 class Extended_FiredBIS_EventHandlers {
     class Mortar_01_base_F {
         class ADDON {
diff --git a/addons/mk6mortar/XEH_postInit.sqf b/addons/mk6mortar/XEH_postInit.sqf
index ffe3b3b814..5c82d55f50 100644
--- a/addons/mk6mortar/XEH_postInit.sqf
+++ b/addons/mk6mortar/XEH_postInit.sqf
@@ -18,3 +18,4 @@
 if (!hasInterface) exitWith {};
 
 ["playerVehicleChanged", {_this call FUNC(handlePlayerVehicleChanged);}] call EFUNC(common,addEventHandler);
+["infoDisplayChanged", {_this call FUNC(turretDisplayLoaded);}] call EFUNC(common,addEventHandler);
diff --git a/addons/mk6mortar/functions/fnc_turretDisplayLoaded.sqf b/addons/mk6mortar/functions/fnc_turretDisplayLoaded.sqf
index 23518f64f3..da7a529d86 100644
--- a/addons/mk6mortar/functions/fnc_turretDisplayLoaded.sqf
+++ b/addons/mk6mortar/functions/fnc_turretDisplayLoaded.sqf
@@ -18,7 +18,8 @@
 
 disableSerialization;
 
-PARAMS_2(_display,_rscType);
+params ["_display", "_rscType"];
+TRACE_2("params",_display,_rscType);
 
 if (_rscType != "Mk6Mortar") exitWith {};
 if (isNull _display) exitWith {};