Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove non functional marker persistency from network component #473

Merged
merged 1 commit into from
Aug 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions addons/network/CfgFunctions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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
{
Expand Down
10 changes: 0 additions & 10 deletions addons/network/XEH_preInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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)';
Expand Down
42 changes: 0 additions & 42 deletions addons/network/fnc_getMarkerPersistent.sqf

This file was deleted.

2 changes: 1 addition & 1 deletion addons/network/fnc_opc.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
};
66 changes: 0 additions & 66 deletions addons/network/fnc_setMarkerPersistent.sqf

This file was deleted.