Fix state machine multiplicator (#116)

* fix state machine overclocking on headless clients * react to smMultiplicator settings change
gruppe-adler · Jan 3, 2021 · c9a0fbe · c9a0fbe
1 parent c3f9707
commit c9a0fbe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/addons/activities/XEH_PREP.hpp b/addons/activities/XEH_PREP.hpp
@@ -16,7 +16,6 @@ PREP(initCommonEventhandlers);
 PREP(initConfig);
 PREP(isInHouse);
 PREP(onCivAdded);
-PREP(overclockStateMachines);
 PREP(reverse_abort);
 PREP(reverse_internal_end);
 PREP(reverse_internal_pfh);

diff --git a/addons/lifecycle/XEH_PREP.hpp b/addons/lifecycle/XEH_PREP.hpp
@@ -13,6 +13,7 @@ PREP(getGlobalCivs);
 PREP(globalSpawnPass);
 PREP(initHCs);
 PREP(isInDistanceFromOtherPlayers);
+PREP(overclockStateMachines);
 PREP(sm_lifecycle);
 PREP(sm_lifecycle_state_death_enter);
 PREP(sm_lifecycle_state_despawn_enter);

diff --git a/addons/lifecycle/functions/fnc_initConfig.sqf b/addons/lifecycle/functions/fnc_initConfig.sqf
@@ -77,6 +77,17 @@ private _settingsGroup = ["GRAD Civs", "2) lifecycle - performance & spawning"];
     _settingsGroup,
     [1, 10, 1, 0],
     true,
-    {},
+    {
+        if (!CBA_isHeadlessClient) exitWith {};
+
+        ISNILS(GVAR(efIDs), []);
+        INFO_1("removing %1 previous addditional state machine ticks per frame", count GVAR(efIDs));
+        {
+            removeMissionEventHandler ["EachFrame", _x];
+        } forEach GVAR(efIDs);
+        GVAR(efIDs) = [];
+
+        [] call FUNC(overclockStateMachines);
+    },
     false
 ] call CBA_fnc_addSetting;
diff --git a/.../functions/fnc_overclockStateMachines.sqf → .../functions/fnc_overclockStateMachines.sqf b/.../functions/fnc_overclockStateMachines.sqf → .../functions/fnc_overclockStateMachines.sqf
@@ -1,7 +1,8 @@
 #include "..\script_component.hpp"
 
 ISNILS(GVAR(efIDs), []);
-for "_i" from 2 to GVAR(smMultiplicator) do {
+
+for "_i" from 2 to (round GVAR(smMultiplicator)) do {
     GVAR(efIDs) pushBack (addMissionEventHandler ["EachFrame", {call cba_statemachine_fnc_clockwork}]);
 };
 INFO_1("CBA statemachines are running %1 more ticks per frame now", count GVAR(efIDs));