Fix killer marker behaviour and prevent cops from seeing jail situati…

…on from the map markers (#60)

* Fix killer marker not going back to red if he's armed

* Prevent cops from seeing "hidden" killer marker in jail and shortly after release

* Fix compilation

* Fix isHandcuffed returning nil every time

* Remove redundant empty line

* Remove cop/killer marker on death

addons/common/XEH_postInit.sqf

@@ -25,6 +25,7 @@ if (isServer) then {
 if (hasInterface) then {
     /* Initial player loadout */
     GVAR(playerLoadout) = getUnitLoadout player;
+    player setVariable [QGVAR(side), playerSide, true];
 
     /* Spectator events */
     [QGVAR(initializeSideSpectator), {

addons/jail/XEH_PREP.hpp

@@ -5,5 +5,6 @@ PREP(free);
 PREP(freeAll);
 PREP(getRandomJailPos);
 PREP(imprison);
+PREP(isHandcuffed);
 PREP(jailMarker);
 PREP(removeReleaseAction);

addons/jail/functions/fnc_free.sqf

@@ -21,6 +21,14 @@ params ["_prisoner"];
 GVAR(prisoners) deleteAt (GVAR(prisoners) findIf {_x isEqualTo _prisoner});
 publicVariable QGVAR(prisoners);
 _prisoner setVariable [QGVAR(isImprisoned), false, true];
+_prisoner setVariable [QGVAR(wasImprisonedRecently), true, true];
+
+[{[_this] call FUNC(isHandcuffed)}, {
+    // Ignore if he's a prisoner again
+}, _prisoner, RECENTLY_FREED_TIMEOUT, {
+    // Clear the flag
+    _this setVariable [QGVAR(wasImprisonedRecently), false, true];
+}] call CBA_fnc_waitUntilAndExecute;
 
 // Terminate prisoner spectator
 [QEGVAR(common,terminateSpectator), [], _prisoner] call CBA_fnc_targetEvent;

addons/jail/functions/fnc_isHandcuffed.sqf

@@ -0,0 +1,24 @@
+#include "script_component.hpp"
+/*
+ * Author: 3Mydlo3
+ * Function checks if a unit is handcuffed.
+ *
+ * Arguments:
+ * 0: Unit to check <UNIT>
+ *
+ * Return Value:
+ * True if unit is handcuffed (alive, but can't move on it's own) <BOOL>
+ *
+ * Example:
+ * [bob] call afsk_jail_fnc_isHandcuffed
+ *
+ * Public: No
+ */
+
+params ["_unit"];
+
+if (EGVAR(common,ACE_Loaded)) then {
+    _unit getVariable [QACEGVAR(captives,isHandcuffed), false]
+} else {
+    _unit getVariable [QEGVAR(jail,isImprisoned), false]
+};

addons/jail/script_component.hpp

@@ -12,3 +12,5 @@
 #endif
 
 #include "\z\afsk\addons\main\script_macros.hpp"
+
+#define RECENTLY_FREED_TIMEOUT 60

addons/killers/functions/fnc_anyKillerFree.sqf

@@ -15,17 +15,9 @@
  * Public: No
  */
 
-if (EGVAR(common,ACE_Loaded)) then {
-    allPlayers findIf {
-        side _x isEqualTo EAST
-        && {alive _x
-        && {!(_x getVariable [QACEGVAR(captives,isHandcuffed), false])
-    }}}!= -1
-} else {
-    allPlayers findIf {
-        side _x isEqualTo EAST
-        && {alive _x
-        && {!(_x getVariable [QEGVAR(jail,isImprisoned), false])
-    }}}!= -1
-};
+allPlayers findIf {
+    side _x isEqualTo EAST
+    && {alive _x
+    && {!([_x] call EFUNC(jail,isHandcuffed))
+}}} != -1
 

addons/markers/XEH_PREP.hpp

@@ -1,6 +1,7 @@
 PREP(createCivilianMarker);
 PREP(createCopMarker);
 PREP(createKillerMarker);
+PREP(createOrUpdateKillerMarker);
 PREP(deleteUnitMarker);
 PREP(markerDecay);
 PREP(markerDecayLoop);

addons/markers/XEH_postInit.sqf

@@ -13,6 +13,14 @@ if (isServer) then {
     };
 };
 
+[QEGVAR(killers,killerKilled), {
+    _this call FUNC(deleteUnitMarker);
+}] call CBA_fnc_addEventHandler;
+
+[QEGVAR(police,copKilled), {
+    _this call FUNC(deleteUnitMarker);
+}] call CBA_fnc_addEventHandler;
+
 [QGVAR(playerDisconnected), {
     params ["_unit", "_id", "_uid", "_name"];
     [_unit] call FUNC(deleteUnitMarker);

addons/markers/functions/fnc_createKillerMarker.sqf

@@ -21,15 +21,18 @@ params ["_killer", ["_hidden", false]];
 private _marker = format["killer_%1", name _killer];
 createMarkerLocal [_marker, getPos _killer];
 _marker setMarkerTypeLocal "mil_dot";
+
 if (_hidden) then {
     _marker setMarkerColorLocal "ColorGreen";
 } else {
     _marker setMarkerColorLocal "ColorEAST";
 };
+
 if (playerSide isEqualTo EAST) then {
     _marker setMarkerSizeLocal [0.75, 0.75];
     _marker setMarkerTextLocal (name _killer);
 } else {
     _marker setMarkerSizeLocal [0.5, 0.5];
 };
+
 _killer setVariable [QGVAR(marker), _marker];

addons/markers/functions/fnc_createOrUpdateKillerMarker.sqf

@@ -0,0 +1,33 @@
+#include "script_component.hpp"
+/*
+ * Author: 3Mydlo3
+ * Function creates or updates marker for given killer.
+ *
+ * Arguments:
+ * 0: Unit to create marker for <OBJECT>
+ * 1: Is it hide marker? <BOOL>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player] call afsk_markers_fnc_createKillerMarker
+ *
+ * Public: No
+ */
+
+params ["_killer", ["_hidden", false]];
+
+private _marker = _killer getVariable [QGVAR(marker), ""];
+
+if (_marker isEqualTo "") then {
+    _marker = [_killer, _hidden] call FUNC(createKillerMarker);
+} else {
+    _marker setMarkerPosLocal (position _killer);
+
+    if (_hidden) then {
+        _marker setMarkerColorLocal "ColorGreen";
+    } else {
+        _marker setMarkerColorLocal "ColorRed";
+    };
+};

addons/markers/functions/fnc_loop.sqf

@@ -43,21 +43,22 @@ if (playerSide isEqualTo WEST) then {
 {
     private _killer = _x;
     private _hidden = !([_killer] call EFUNC(common,appearsArmed));
-    private _marker = _killer getVariable [QGVAR(marker), ""];
+
     // Check if player should be able to see killer's marker
-    if (playerSide isEqualTo EAST || {_hidden}) then {
-        // Check if killer already has marker
-        if (_marker isEqualTo "") then {
-            _marker = [_killer, _hidden] call FUNC(createKillerMarker);
-        } else {
-            _marker setMarkerPosLocal (position _killer);
-            if (_hidden) then {
-                _marker setMarkerColorLocal "ColorGreen";
-            } else {
-                _marker setMarkerColorLocal "ColorRed";
-            };
-        };
+    // Player must:
+    // 1. either be EAST (other killer)
+    // 2a. or a killer must appear as unarmed
+    // 2b. and not be in prison, or recently freed from prison
+    if (playerSide isEqualTo EAST) then {
+        [_killer, _hidden] call FUNC(createOrUpdateKillerMarker);
     } else {
+        private _isOrWasImprisoned = [_killer] call EFUNC(jail,isHandcuffed)
+                                    || {_killer getVariable [QEGVAR(jail,wasImprisonedRecently), false]};
+
+        if (_hidden && {!_isOrWasImprisoned}) exitWith {
+            [_killer, _hidden] call FUNC(createOrUpdateKillerMarker);
+        };
+
         if !(_marker isEqualTo "") then {
             [_killer] call FUNC(deleteUnitMarker);
         };