Fire - Mini-Rewrite

addons/cookoff/functions/fnc_cookOff.sqf

@@ -107,7 +107,7 @@ if (_smokeDelayEnabled) then {
             _vehicle setVariable [QGVAR(nextFlame), _time + (MIN_TIME_BETWEEN_FLAMES max random MAX_TIME_BETWEEN_FLAMES)];
 
             {
-                [QEGVAR(fire,burn), [_x, _intensity * 1.5, _instigator]] call CBA_fnc_globalEvent;
+                [QEGVAR(fire,burn), [_x, _intensity * 1.5, _instigator], _x] call CBA_fnc_targetEvent;
             } forEach crew _vehicle
         };
 

addons/fire/XEH_PREP.hpp

@@ -1,10 +1,10 @@
 PREP(burn);
-PREP(isBurning);
-PREP(isPlant);
+PREP(burnEffects);
 PREP(burnIndicator);
 PREP(burnReaction);
+PREP(burnSimulation);
 PREP(fireManagerPFH);
-
+PREP(isBurning);
 PREP(medical_progress);
 PREP(medical_success);
 PREP(medical_canPatDown);

addons/fire/XEH_postInit.sqf

@@ -1,38 +1,46 @@
 #include "script_component.hpp"
 
-[QGVAR(burn), FUNC(burn)] call CBA_fnc_addEventHandler;
+[QGVAR(burn), LINKFUNC(burn)] call CBA_fnc_addEventHandler;
+[QGVAR(burnEffects), LINKFUNC(burnEffects)] call CBA_fnc_addEventHandler;
+[QGVAR(burnSimulation), LINKFUNC(burnSimulation)] call CBA_fnc_addEventHandler;
+
+// Only play sound if enabled in settings
 [QGVAR(playScream), {
+    if (!GVAR(enableScreams)) exitWith {};
+
     params ["_scream", "_source"];
-    // only play sound if enabled in settings
-    if (GVAR(enableScreams)) then {
-        _source say3D _scream;
-    };
+
+    _source say3D _scream;
 }] call CBA_fnc_addEventHandler;
 
-["ace_settingsInitialized", {
-    TRACE_1("settingsInit", GVAR(enabled));
-    if (!GVAR(enabled)) exitWith {};
+if (isServer) then {
+    ["CBA_settingsInitialized", {
+        TRACE_1("settingsInit", GVAR(enabled));
+
+        if (!GVAR(enabled)) exitWith {};
+
+        GVAR(fireSources) = createHashMap;
 
-    if (isServer) then {
         [QGVAR(addFireSource), {
-            params ["_source", "_radius", "_intensity", "_key", ["_condition", { true }], ["_conditionArgs", []]];
+            params ["_source", "_radius", "_intensity", "_key", ["_condition", {true}], ["_conditionArgs", []]];
+
             private _fireLogic = createVehicle ["ACE_LogicDummy", [0, 0, 0], [], 0, "NONE"];
+
             if (_source isEqualType objNull) then {
                 _fireLogic attachTo [_source];
             } else {
                 _fireLogic setPosASL _source;
             };
 
-            [GVAR(fireSources), _key, [_fireLogic, _radius, _intensity, _condition, _conditionArgs]] call CBA_fnc_hashSet;
+            GVAR(fireSources) set [_key, [_fireLogic, _radius, _intensity, _condition, _conditionArgs]];
         }] call CBA_fnc_addEventHandler;
 
         [QGVAR(removeFireSource), {
             params ["_key"];
-            [GVAR(fireSources), _key] call CBA_fnc_hashRem;
-        }] call CBA_fnc_addEventHandler;
 
-        [{ _this call FUNC(fireManagerPFH) }, FIRE_MANAGER_PFH_DELAY, []] call CBA_fnc_addPerFrameHandler;
-        GVAR(fireSources) = [[], nil] call CBA_fnc_hashCreate;
-    };
-}] call CBA_fnc_addEventHandler;
+            GVAR(fireSources) deleteAt _key;
+        }] call CBA_fnc_addEventHandler;
 
+        [LINKFUNC(fireManagerPFH), FIRE_MANAGER_PFH_DELAY, []] call CBA_fnc_addPerFrameHandler;
+    }] call CBA_fnc_addEventHandler;
+};

addons/fire/XEH_preInit.sqf

@@ -8,6 +8,4 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-GVAR(burningPlants) = [];
-
 ADDON = true;