From 8e1d96049655c5f40bcafdc97728df1817adfd93 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sat, 26 Nov 2016 10:18:06 -0600 Subject: [PATCH] simply prevent display EH loading after revive. Thanks to @Ignatz-HeMan for the report. --- .../compile/setup/masterLoop/init.sqf | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index 30887849..3fc65639 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -1,13 +1,17 @@ // make sure we wait for Display #46 waitUntil {!(isNull (findDisplay 46))}; + // setup display EH's -{ - (findDisplay 46) displayAddEventHandler [_x,(["CfgEpochClient", _x, ""] call EPOCH_fnc_returnConfigEntryV2)]; -} forEach (["CfgEpochClient", "displayAddEventHandler", []] call EPOCH_fnc_returnConfigEntryV2); -// reset anim state -player switchMove ""; -// setup Epoch Hud -call epoch_dynamicHUD_start; +if (isNil "EPOCH_display_setup_complete") then { + { + (findDisplay 46) displayAddEventHandler [_x,(["CfgEpochClient", _x, ""] call EPOCH_fnc_returnConfigEntryV2)]; + } forEach (["CfgEpochClient", "displayAddEventHandler", []] call EPOCH_fnc_returnConfigEntryV2); + // reset anim state + player switchMove ""; + // setup Epoch Hud + call epoch_dynamicHUD_start; + EPOCH_display_setup_complete = true; +}; _prevEquippedItem = []; _damagePlayer = damage player;