diff --git a/addons/network/CfgEventHandlers.hpp b/addons/network/CfgEventHandlers.hpp index b69469f1b..f0a9f14d9 100644 --- a/addons/network/CfgEventHandlers.hpp +++ b/addons/network/CfgEventHandlers.hpp @@ -1,18 +1,6 @@ -class Extended_PreStart_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); - }; -}; - class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_FILE(XEH_preInit)); }; }; - -class Extended_PostInit_EventHandlers { - class ADDON { - serverInit = QUOTE(call COMPILE_FILE(XEH_postServerInit)); - }; -}; diff --git a/addons/network/XEH_postServerInit.sqf b/addons/network/XEH_postServerInit.sqf deleted file mode 100644 index 5bd9d344b..000000000 --- a/addons/network/XEH_postServerInit.sqf +++ /dev/null @@ -1,23 +0,0 @@ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" -LOG(MSG_INIT); -// Why would we send __SERVER__ to an on PLAYER connected event, -// [["__SERVER__","0",objNull,true]] call CBA_fnc_globalEvent; - -addMissionEventHandler ["PlayerConnected", { - params ["_id", "_uid", "_name", "_jip", "_owner"]; - - if (_name == "__SERVER__") exitWith {}; - - private _object = objNull; - { - if (name _x == _name) exitWith { _object = _x; }; - } forEach playableUnits; - - if (!isNull _object) then { - [_name, _uid, _object] call FUNC(opc); - }; -}]; - -// Announce the completion of the initialization of the script -ADDON = true; diff --git a/addons/network/XEH_preInit.sqf b/addons/network/XEH_preInit.sqf index 5cf48f000..b1f7900e0 100644 --- a/addons/network/XEH_preInit.sqf +++ b/addons/network/XEH_preInit.sqf @@ -42,20 +42,12 @@ ADDON = false; #endif -// COMPATIBILITY Feature - Make sure Override variables are initialized appropriately for sync broadcast. -ISNIL(timeSync_Disabled,true); // deprecated -ISNIL(weatherSync_Disabled,true); - DEPRECATE(fnc_remoteExecute,fnc_globalExecute); DEPRECATE(fnc_remoteSay,fnc_globalSay); // TODO: Add functions that add to opc/opd, instead of direct handling? if (SLX_XEH_MACHINE select 3) then { - PREP(opc); - PREP(opd); - PREP(sync); - FUNC(id) = { "server" }; // [QGVAR(join), { [QGVAR(opc), _this] call CBA_fnc_localEvent }] call CBA_fnc_addEventHandler; diff --git a/addons/network/XEH_preStart.sqf b/addons/network/XEH_preStart.sqf deleted file mode 100644 index 2f2c8f8d1..000000000 --- a/addons/network/XEH_preStart.sqf +++ /dev/null @@ -1,5 +0,0 @@ -#include "script_component.hpp" - -PREP(opc); -PREP(opd); -PREP(sync); diff --git a/addons/network/fnc_opc.sqf b/addons/network/fnc_opc.sqf deleted file mode 100644 index 1a4ed89b1..000000000 --- a/addons/network/fnc_opc.sqf +++ /dev/null @@ -1,17 +0,0 @@ -/* - Internal Function: CBA_network_fnc_opc -*/ -#include "script_component.hpp" - -private["_plName"]; -params ["_name","_id","_obj"]; - -_plName = if (isNull player) then { "" } else { name player }; - -if ((_name!= "__SERVER__") && {(_name!= format["%1", _plName])}) then -{ - if (time > 0) then - { - [_obj] call FUNC(sync); - }; -}; diff --git a/addons/network/fnc_opd.sqf b/addons/network/fnc_opd.sqf deleted file mode 100644 index cef607cb6..000000000 --- a/addons/network/fnc_opd.sqf +++ /dev/null @@ -1,8 +0,0 @@ -/* -Internal Function: CBA_network_fnc_opd -*/ -#include "script_component.hpp" - -params ["_name","_id"]; - -TRACE_1("Player Disconnected: " + str(_name)); diff --git a/addons/network/fnc_sync.sqf b/addons/network/fnc_sync.sqf deleted file mode 100644 index 9067cd5c5..000000000 --- a/addons/network/fnc_sync.sqf +++ /dev/null @@ -1,8 +0,0 @@ -/* -Internal Function: CBA_network_fnc_sync -*/ -#include "script_component.hpp" - -// COMPATIBILITY Feature - Check Override variables before broadcasting the sync. -//if !(GVAR(weatherSync_Disabled)) then { [QGVAR(weather), [overCast, fog, rain]] call CBA_fnc_globalEvent }; -//if !(GVAR(timeSync_Disabled)) then { [_channel, {[QGVAR(date), _this] call CBA_fnc_localEvent}, date] call CBA_fnc_globalExecute };