Merge pull request #156 from shadow-fa/issue-142-FTMarkers

Issue 142: FTMemberMarkers fix JIP issues

f/FTMemberMarkers/f_localFTMemberMarker.sqf

@@ -54,7 +54,7 @@ while{alive _unit && (_unit in f_var_HandlerGroup)} do
 		_mkr setMarkerDirLocal _dir;
 		// makes a call to the function defined in f_setLocalFTMemberMarkers.sqf
 		// retreives the stored color from the unit.
-		_mkr setMarkerColorLocal (_unit getvariable ["assignedTeam","ColorWhite"]);
+		_mkr setMarkerColorLocal ([_unit] call f_fnc_GetUpdatedTeamValue);
 	} else {
 		f_var_HandlerGroup = f_var_HandlerGroup - [_unit];
 	};

f/FTMemberMarkers/fn_SetLocalFTMemberMarkers.sqf

@@ -10,6 +10,8 @@
 //
 // ====================================================================================
 
+if (!hasInterface) exitWith {};
+
 // MAKE SURE THE PLAYER INITIALIZES PROPERLY
 if (!isDedicated && (isNull player)) then
 {
@@ -22,14 +24,29 @@ if (side player isEqualto sideLogic) exitWith {};
 // ====================================================================================
 
 // DEFINE HELPER-FUNCTION
-// Define a small function to set a unit's team color
+// Define a small function to get/set a unit's team color
+// This function updates the assignedTeam variable
+// if assignedTeam returns a new team(color).
 
-f_fnc_SetTeamValue =
+f_fnc_GetUpdatedTeamValue =
 {
-	params["_unit", "_color"];
-	_unit setvariable ["assignedTeam",_color];
+	params["_unit"];
+	private _team = assignedTeam _unit;
+	private _color = _unit getvariable ["assignedTeam","ColorWhite"];
+	//_team can be nil if the player is controlling another unit (uav, zeus).
+	if(!isNil "_team") then
+	{
+		private _colorNew = [_team] call f_fnc_GetMarkerColor;
+		if(_color != _colorNew) then
+		{
+			_unit setVariable ["assignedTeam",_colorNew];
+			_color = _colorNew;
+		};
+	};
+	_color
 };
 
+
 // ====================================================================================
 
 // START DRAWING MARKERS
@@ -50,13 +67,3 @@ f_fnc_SetTeamValue =
 		sleep 5;
 	};
 };
-
-// ====================================================================================
-
-// SYNCHRONIZE TEAM COLORS
-// If the player is the groupleader he will take charge of updateing the other units of the colorvalue.
-
-if(player == leader (group player)) then
-{
-	[group player,player] spawn f_fnc_LocalFTMarkerSync;
-};

f/functions.hpp

@@ -55,7 +55,6 @@ class F // Defines the "owner"
 		file = "f\FTMemberMarkers";
 		class SetLocalFTMemberMarkers{};
 		class GetMarkerColor{};
-		class LocalFTMarkerSync{};
 	};
 	class bodyRemoval
 	{