remove obsolete team synch code (#511)

* remove obsolete team synch code * readd event for backwards compatibility
CBATeam · Sep 24, 2016 · 54ef2da · 54ef2da
1 parent b04553d
commit 54ef2da
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 85 deletions.
diff --git a/addons/common/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp
@@ -1,10 +1,4 @@
 
-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));

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
@@ -35,28 +35,11 @@ for "_i" from 0 to ((count (CFG)) - 1) do {
     };
 };
 
-// system to synch team colors
-// Note: 1.62 added Multiplayer synchronization for assigned team
-// Run the PFEH only if on previous versions, keep the event for backwards compatability
-
-PREP(onTeamColorChanged);
-PREP(synchTeamColors);
-
-["CBA_teamColorChanged", FUNC(onTeamColorChanged)] call CBA_fnc_addEventHandler;
-
-if (hasInterface && {(productVersion select 2) < 162}) then {
-    [FUNC(synchTeamColors), 1, []] call CBA_fnc_addPerFrameHandler;
-
-    if (didJIP) then {
-        {
-            private _team = _x getVariable [QGVAR(synchedTeam), ""];
-            if (_team != "") then {
-                _x assignTeam _team;
-            };
-            true
-        } count allUnits;
-    };
-};
+// event for switching team colors, DEPRECATED
+["CBA_teamColorChanged", {
+    params ["_unit", "_team"];
+    _unit assignTeam _team;
+}] call CBA_fnc_addEventHandler;
 
 //Event for switching vehicle var names from CBA_fnc_switchPlayer
 ["CBA_setVehicleVarName", {

diff --git a/addons/common/XEH_preStart.sqf b/addons/common/XEH_preStart.sqf
diff --git a/addons/common/fnc_onTeamColorChanged.sqf b/addons/common/fnc_onTeamColorChanged.sqf
diff --git a/addons/common/fnc_synchTeamColors.sqf b/addons/common/fnc_synchTeamColors.sqf