Merge pull request #473 from CBATeam/remove-obsolete-setMarkerPersistent

remove non functional marker persistency from network component
CBATeam · Aug 22, 2016 · 3b63db7 · 3b63db7
2 parents e9c58d0 + 67fc27b
commit 3b63db7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 131 deletions.
diff --git a/addons/network/CfgFunctions.hpp b/addons/network/CfgFunctions.hpp
@@ -9,12 +9,6 @@ class CfgFunctions
     {
         class Network
         {
-            // CBA_fnc_getMarkerPersistent
-            class getMarkerPersistent
-            {
-                description = "Checks if a global marker is persistent for JIP players.";
-                file = "\x\cba\addons\network\fnc_getMarkerPersistent.sqf";
-            };
             // CBA_fnc_globalExecute
             class globalExecute
             {
@@ -39,12 +33,6 @@ class CfgFunctions
                 description = "CBA_fnc_publicVariable does only broadcast the new value if it doesn't exist in missionNamespace or the new value is different to the one in missionNamespace. Checks also for different types. Nil as value gets always broadcasted.";
                 file = "\x\cba\addons\network\fnc_publicVariable.sqf";
             };
-            // CBA_fnc_setMarkerPersistent
-            class setMarkerPersistent
-            {
-                description = "Sets or unsets JIP persistency on a global marker.";
-                file = "\x\cba\addons\network\fnc_setMarkerPersistent.sqf";
-            };
             // CBA_fnc_setVarNet
             class setVarNet
             {

diff --git a/addons/network/XEH_preInit.sqf b/addons/network/XEH_preInit.sqf
@@ -49,25 +49,15 @@ ISNIL(weatherSync_Disabled,true);
 DEPRECATE(fnc_remoteExecute,fnc_globalExecute);
 DEPRECATE(fnc_remoteSay,fnc_globalSay);
 
-
-#define ADD_PERSISTENT_MARKER { [_this select 0, true] call (uiNamespace getVariable "CBA_fnc_setMarkerPersistent") }
-OBSOLETE(fnc_addPersistentMarker,ADD_PERSISTENT_MARKER);
-#define REMOVE_PERSISTENT_MARKER { [_this select 0, false] call (uiNamespace getVariable "CBA_fnc_setMarkerPersistent") }
-OBSOLETE(fnc_removePersistentMarker,REMOVE_PERSISTENT_MARKER);
-
 // TODO: Add functions that add to opc/opd, instead of direct handling?
 
 if (SLX_XEH_MACHINE select 3) then {
-    ISNIL(MARKERS,[]); // Sync Markers for JIP
-
     PREP(opc);
     PREP(opd);
     PREP(sync);
 
     FUNC(id) = { "server" };
 
-    [QUOTE(GVAR(marker_persist)), { _this call (uiNamespace getVariable "CBA_fnc_setMarkerPersistent") }] call (uiNamespace getVariable "CBA_fnc_addEventHandler");
-
     // [QGVAR(join), { [QGVAR(opc), _this] call CBA_fnc_localEvent }] call CBA_fnc_addEventHandler;
 
     // onPlayerConnected '[_name,_id] call FUNC(opc)';

diff --git a/addons/network/fnc_getMarkerPersistent.sqf b/addons/network/fnc_getMarkerPersistent.sqf
diff --git a/addons/network/fnc_opc.sqf b/addons/network/fnc_opc.sqf
@@ -12,6 +12,6 @@ if ((_name!= "__SERVER__") && {(_name!= format["%1", _plName])}) then
 {
     if (time > 0) then
     {
-        [_obj] call FUNC(sync); { _x setMarkerPos (getMarkerPos _x) } forEach GVAR(markers);
+        [_obj] call FUNC(sync);
     };
 };
diff --git a/addons/network/fnc_setMarkerPersistent.sqf b/addons/network/fnc_setMarkerPersistent.sqf