From b94cb3b85d32901d8b1e3a97a9ec6a2b02d65bc5 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 12 Aug 2015 16:14:12 -0500 Subject: [PATCH 1/2] #2129 - Don't draw nametags when escape menu is open --- addons/nametags/functions/fnc_onDraw3d.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/nametags/functions/fnc_onDraw3d.sqf b/addons/nametags/functions/fnc_onDraw3d.sqf index 43996e17b2..217453bc76 100644 --- a/addons/nametags/functions/fnc_onDraw3d.sqf +++ b/addons/nametags/functions/fnc_onDraw3d.sqf @@ -17,8 +17,8 @@ private ["_onKeyPressAlphaMax", "_defaultIcon", "_distance", "_alpha", "_icon", "_targets", "_pos2", "_vecy", "_relPos", "_projDist", "_pos", "_target", "_targetEyePosASL", "_ambientBrightness", "_maxDistance"]; -//don't show nametags in spectator -if ((isNull ACE_player) || {!alive ACE_player}) exitWith {}; +//don't show nametags in spectator or if RscDisplayMPInterrupt is open +if ((isNull ACE_player) || {!alive ACE_player} || {!isNull (findDisplay 49)}) exitWith {}; _ambientBrightness = ((([] call EFUNC(common,ambientBrightness)) + ([0, 0.4] select ((currentVisionMode ace_player) != 0))) min 1) max 0; _maxDistance = _ambientBrightness * GVAR(PlayerNamesViewDistance); From 3425913d27790bfb3e290fc6f21ef4050ab0f5d2 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 12 Aug 2015 23:32:57 -0500 Subject: [PATCH 2/2] #2132 - Don't use depreciated Helicopter_F --- addons/captives/CfgVehicles.hpp | 4 ++-- addons/captives/functions/fnc_canLoadCaptive.sqf | 2 +- addons/captives/functions/fnc_doLoadCaptive.sqf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp index 187fe1a746..774ecf87e3 100644 --- a/addons/captives/CfgVehicles.hpp +++ b/addons/captives/CfgVehicles.hpp @@ -190,8 +190,8 @@ class CfgVehicles { defaultValue = 1; }; class requireSurrender { - displayName = CSTRING(ModuleSettings_allowSurrender_name); - description = CSTRING(ModuleSettings_allowSurrender_description); + displayName = CSTRING(ModuleSettings_requireSurrender_name); + description = CSTRING(ModuleSettings_requireSurrender_description); typeName = "NUMBER"; class values { class disable { diff --git a/addons/captives/functions/fnc_canLoadCaptive.sqf b/addons/captives/functions/fnc_canLoadCaptive.sqf index 3f2677da76..0e028ac1ec 100644 --- a/addons/captives/functions/fnc_canLoadCaptive.sqf +++ b/addons/captives/functions/fnc_canLoadCaptive.sqf @@ -27,7 +27,7 @@ if (isNull _target) then { }; if (isNull _vehicle) then { - _objects = nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship_F"], 10]; + _objects = nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship"], 10]; if ((count _objects) > 0) then {_vehicle = _objects select 0;}; }; diff --git a/addons/captives/functions/fnc_doLoadCaptive.sqf b/addons/captives/functions/fnc_doLoadCaptive.sqf index 69b7276142..d7df42eb0a 100644 --- a/addons/captives/functions/fnc_doLoadCaptive.sqf +++ b/addons/captives/functions/fnc_doLoadCaptive.sqf @@ -29,7 +29,7 @@ if (isNull _target) then { if (isNull _target) exitWith {}; if (isNull _vehicle) then { - _objects = nearestObjects [_unit, ["Car_F", "Tank_F", "Helicopter_F", "Boat_F", "Plane_F"], 10]; + _objects = nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship"], 10]; if ((count _objects) > 0) then {_vehicle = _objects select 0;}; }; if (isNull _vehicle) exitWith {};