remove all checks for versions below v1.58

CBATeam · Jul 13, 2016 · 27adc01 · 27adc01
1 parent f70aada
commit 27adc01
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 64 deletions.
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
@@ -2,31 +2,7 @@
 #include "script_component.hpp"
 
 //Install PFEH:
-if (isNil {canSuspend}) then {
-    // pre 1.58
-    ["CBA_PFH", "onEachFrame", {
-        call FUNC(onFrame);
-        GVAR(lastFrameRender) = diag_frameNo;
-    }] call BIS_fnc_addStackedEventHandler;
-
-    FUNC(monitorFrameRender) = {
-        if (abs (diag_frameno - GVAR(lastFrameRender)) > DELAY_MONITOR_THRESHOLD) then {
-            // Restores the onEachFrame handler
-            ["CBA_PFH", "onEachFrame", {
-                call FUNC(onFrame);
-                GVAR(lastFrameRender) = diag_frameNo;
-            }] call BIS_fnc_addStackedEventHandler;
-            TRACE_1("PFH restored",nil);
-        };
-    };
-
-    // Use a trigger, runs every 0.5s, unscheduled execution
-    GVAR(perFrameTrigger) = createTrigger ["EmptyDetector", [0,0,0], false];
-    GVAR(perFrameTrigger) setTriggerStatements ['FUNC(monitorFrameRender) call CBA_fnc_directCall', "", ""];
-} else {
-    // 1.58 and later
-    addMissionEventHandler ["EachFrame", FUNC(onFrame)];
-};
+addMissionEventHandler ["EachFrame", FUNC(onFrame)];
 
 LOG(MSG_INIT);
 

diff --git a/addons/common/init_perFrameHandler.sqf b/addons/common/init_perFrameHandler.sqf
@@ -114,17 +114,9 @@ if (isMultiplayer) then {
             GVAR(lastTickTime) = _tickTime;
         };
 
-        if (isNil {canSuspend}) then {
-            // pre v1.58
-            ["CBA_SynchMissionTime", "onPlayerConnected", {
-                _owner publicVariableClient "CBA_missionTime";
-            }] call BIS_fnc_addStackedEventHandler;
-        } else {
-            // v1.58 and later
-            addMissionEventHandler ["PlayerConnected", {
-                (_this select 4) publicVariableClient "CBA_missionTime";
-            }];
-        };
+        addMissionEventHandler ["PlayerConnected", {
+            (_this select 4) publicVariableClient "CBA_missionTime";
+        }];
     } else {
         CBA_missionTime = -1;
 

diff --git a/addons/network/XEH_postServerInit.sqf b/addons/network/XEH_postServerInit.sqf
@@ -4,37 +4,20 @@ LOG(MSG_INIT);
 // Why would we send __SERVER__ to an on PLAYER connected event,
 // [["__SERVER__","0",objNull,true]] call CBA_fnc_globalEvent;
 
-if (isNil {canSuspend}) then {
-    // pre v1.58
-    // OPC gets _id, _uid, _name
-    [QUOTE(GVAR(opc)), "onPlayerConnected", {
-        if (_name=="__SERVER__") exitWith {};
-        _obj=objNull;
-        {
-            if (_name == name _x) then
-            {
-                _obj=_x;
-            };
-        } forEach playableUnits;
-        if (!isNull _obj) then {[_name, _uid, _obj] call FUNC(opc);};
-    }] call BIS_fnc_addStackedEventhandler;
-} else {
-    // v1.58 and later
-    addMissionEventHandler ["PlayerConnected", {
-        params ["_id", "_uid", "_name", "_jip", "_owner"];
+addMissionEventHandler ["PlayerConnected", {
+    params ["_id", "_uid", "_name", "_jip", "_owner"];
 
-        if (_name == "__SERVER__") exitWith {};
+    if (_name == "__SERVER__") exitWith {};
 
-        private _object = objNull;
-        {
-            if (name _x == _name) exitWith { _object = _x; };
-        } forEach playableUnits;
+    private _object = objNull;
+    {
+        if (name _x == _name) exitWith { _object = _x; };
+    } forEach playableUnits;
 
-        if (!isNull _object) then {
-            [_name, _uid, _object] call FUNC(opc);
-        };
-    }];
-};
+    if (!isNull _object) then {
+        [_name, _uid, _object] call FUNC(opc);
+    };
+}];
 
 // Announce the completion of the initialization of the script
 ADDON = true;