Merge pull request #170 from jokoho48/fixUndef_xinRPFH

posible fix for #169
CBATeam · Oct 9, 2015 · 5239b1b · 5239b1b
2 parents 2bb41c0 + 52d829b
commit 5239b1b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,4 @@ Thumbs.db
 /addons/CBA_Project.sublime-workspace
 
 *~
-*#
+*#
diff --git a/addons/common/fnc_addPerFrameHandler.sqf b/addons/common/fnc_addPerFrameHandler.sqf
@@ -23,7 +23,7 @@ Author:
 ---------------------------------------------------------------------------- */
 #include "script_component.hpp"
 
-private["_handle", "_data", "_publicHandle"];
+private ["_handle", "_data", "_publicHandle"];
 params ["_func","_delay", ["_params",[]]];
 
 if (!isNil "_func") then {

diff --git a/addons/common/fnc_removePerFrameHandler.sqf b/addons/common/fnc_removePerFrameHandler.sqf
@@ -36,8 +36,8 @@ _newArray = [];
 GVAR(nextPFHid) = ({
     private ["_newHandle", "_return"];
     _return = false;
-    _x params ["", "", "", "", "", "_publicH"];
     if !(isNil "_x") then {
+        _x params ["", "", "", "", "", "_publicH"];
         _newHandle = _newArray pushBack _x;
         GVAR(PFHhandles) set [_publicH, _newHandle];
         _return = true;

diff --git a/addons/common/init_perFrameHandler.sqf b/addons/common/init_perFrameHandler.sqf
@@ -127,8 +127,6 @@ FUNC(monitorFrameRender) = {
 
 FUNC(onFrame) = {
     TRACE_1("Executing onFrame",nil);
-
-    private "_handlerData";
     GVAR(lastFrameRender) = diag_frameNo;
     // if(GVAR(lastCount) > (GVAR(fpsCount)-1)) then {
         // hint "FUCK UP IN SEQUENCE!";
@@ -138,13 +136,14 @@ FUNC(onFrame) = {
     // GVAR(fpsCount) = GVAR(fpsCount) + 1;
     // player sideChat format["c: %1", GVAR(perFrameHandlerArray)];
     {
-        _handlerData = _x;
-        if (_handlerData params ["_func", "_delay", "_delta", "", "_args", "_idPFH"]) then {
-            if (diag_tickTime > _delta) then {
-                [_args, _idPFH] call _func;
-                _delta = diag_tickTime + _delay;
-                //TRACE_1("data", _data);
-                _handlerData set [2, _delta];
+        if !(isNil "_x") then {
+            if (_x params ["_func", "_delay", "_delta", "", "_args", "_idPFH"]) then {
+                if (diag_tickTime > _delta) then {
+                    [_args, _idPFH] call _func;
+                    _delta = diag_tickTime + _delay;
+                    //TRACE_1("data", _data);
+                    _x set [2, _delta];
+                };
             };
         };
     } count GVAR(perFrameHandlerArray);