Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update showHud setter for Squad Radar" (#4485)

Browse Source
This commit is contained in:
jonpas 2016-09-30 00:53:17 +02:00 committed by PabstMirror
parent 1bd7a66888
commit dad4293216
11 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/captives/functions/fnc_handlePlayerChanged.sqf
View File

@ -21,7 +21,7 @@ params ["_newUnit","_oldUnit"];
//set showHUD based on new unit status:
if ((_newUnit getVariable [QGVAR(isHandcuffed), false]) || {_newUnit getVariable [QGVAR(isSurrendering), false]}) then {
TRACE_1("Player Change (showHUD false)",_newUnit);
["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
} else {
TRACE_1("Player Change (showHUD true)",_newUnit);
["captive", []] call EFUNC(common,showHud); //same as showHud true;

2
addons/captives/functions/fnc_handleZeusDisplayChanged.sqf
View File

@ -19,7 +19,7 @@
if ((ACE_player getVariable [QGVAR(isHandcuffed), false]) || {ACE_player getVariable [QGVAR(isSurrendering), false]}) then {
TRACE_1("Player Change (showHUD false)",ACE_player);
["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
} else {
TRACE_1("Player Change (showHUD true)",ACE_player);
["captive", []] call EFUNC(common,showHud); //same as showHud true;

2
addons/captives/functions/fnc_setHandcuffed.sqf
View File

@ -50,7 +50,7 @@ if (_state) then {
_unit setVariable [QGVAR(CargoIndex), ((vehicle _unit) getCargoIndex _unit), true];
if (_unit == ACE_player) then {
["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
};
// fix anim on mission start (should work on dedicated servers)

2
addons/captives/functions/fnc_setSurrendered.sqf
View File

@ -47,7 +47,7 @@ if (_state) then {
[_unit, "setCaptive", QGVAR(Surrendered), true] call EFUNC(common,statusEffect_set);
if (_unit == ACE_player) then {
["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
};
[_unit] call EFUNC(common,fixLoweredRifleAnimation);

10
addons/common/functions/fnc_showHud.sqf
View File

@ -15,7 +15,6 @@
* - menu: Boolean - show commanding menu (hides HC related menus)
* - group: Boolean - show group info bar (hides squad leader info bar)
* - cursors: Boolean - show HUD weapon cursors (connected with scripted HUD)
* - squadRadar: Boolean - show HUD squad radar (since 1.62)
*
* Return Value:
* Resulting ShowHud Array <ARRAY>
@ -30,12 +29,7 @@
if (!hasInterface) exitWith {[-1]};
params [["_reason", "", [""]], ["_mask", [], [[]], [0,8,9]]];
if ((count _mask) == 8) then {
ACE_LOGWARNING_1("ace_common_fnc_showHud - mask now takes 9 arguments in 1.62 [called with %1]",_this);
_mask pushBack true;
};
params [["_reason", "", [""]], ["_mask", [], [[]], [0,8]]];
if (isArray (missionConfigFile >> "showHUD")) then {
//(showHud = 0;) is fine - the array is the problem
@ -56,7 +50,7 @@ if (_reason != "") then {
GVAR(showHudHash) params ["", "_reasons", "_masks"];
private _resultMask = [];
for "_index" from 0 to 8 do {
for "_index" from 0 to 7 do {
private _set = true; //Default to true
{
if (!(_x select _index)) exitWith {

7
addons/ui/ACE_Settings.hpp
View File

@ -43,13 +43,6 @@ class ACE_Settings {
value = 0;
isClientSettable = 1;
};
class GVAR(squadRadar) {
category = CSTRING(Category);
displayName = CSTRING(SquadRadar);
typeName = "BOOL";
value = 1;
isClientSettable = 1;
};
// ADVANCED
// Soldier

5
addons/ui/CfgVehicles.hpp
View File

@ -42,11 +42,6 @@ class CfgVehicles {
typeName = "BOOL";
defaultValue = 0;
};
class squadRadar {
displayName = CSTRING(SquadRadar);
typeName = "BOOL";
defaultValue = 1;
};
// ADVANCED
// Soldier

1
addons/ui/functions/fnc_moduleInit.sqf
View File

@ -30,7 +30,6 @@ if (isArray (missionConfigFile >> "showHUD")) then {
[_logic, QGVAR(vehicleCompass), "vehicleCompass"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(commandMenu), "commandMenu"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(groupBar), "groupBar"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(squadRadar), "squadRadar"] call EFUNC(common,readSettingFromModule);
};
// Advanced

3
addons/ui/functions/fnc_setElements.sqf
View File

@ -31,6 +31,5 @@ if (isArray (missionConfigFile >> "showHUD")) exitWith {
true,
GVAR(commandMenu),
GVAR(groupBar),
true,
GVAR(squadRadar)
true
]] call EFUNC(common,showHud);

2
addons/ui/script_component.hpp
View File

@ -19,7 +19,7 @@
// Basic Elements
#define ELEMENTS_BASIC [QGVAR(soldierVehicleWeaponInfo), QGVAR(vehicleRadar), QGVAR(vehicleCompass), QGVAR(commandMenu), QGVAR(groupBar), QGVAR(squadRadar)]
#define ELEMENTS_BASIC [QGVAR(soldierVehicleWeaponInfo), QGVAR(vehicleRadar), QGVAR(vehicleCompass), QGVAR(commandMenu), QGVAR(groupBar)]
// Locations
#define ANYWHERE 0

3
addons/ui/stringtable.xml
View File

@ -90,9 +90,6 @@
<Japanese>指揮メニュー</Japanese>
<Polish>Pasek grupy</Polish>
</Key>
<Key ID="STR_ACE_UI_SquadRadar">
<English>Squad Radar</English>
</Key>
<Key ID="STR_ACE_UI_WeaponName">
<English>Weapon Name</English>
<Czech>Název zbraně</Czech>