From 77e13ca5be0f40ecd507c777c8cd46886fc2d4b8 Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 14 May 2015 23:18:38 +0200 Subject: [PATCH 01/13] Seperated ACE_Settings --- addons/nametags/ACE_Settings.hpp | 57 ++++++++++++++++++++++++++++++ addons/nametags/config.cpp | 59 +------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 addons/nametags/ACE_Settings.hpp diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp new file mode 100644 index 0000000000..986b5c187b --- /dev/null +++ b/addons/nametags/ACE_Settings.hpp @@ -0,0 +1,57 @@ +class ACE_Settings { + class GVAR(defaultNametagColor) { + value[] = {0.77, 0.51, 0.08, 1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_DefaultNametagColor"; + }; + class GVAR(showPlayerNames) { + value = 1; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowPlayerNames"; + description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; + values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_Enabled", "$STR_ACE_Common_OnlyCursor", "$STR_ACE_Common_OnlyOnKeypress", "$STR_ACE_Common_OnlyCursorAndKeyPress"}; + }; + class GVAR(showPlayerRanks) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowPlayerRanks"; + }; + class GVAR(showVehicleCrewInfo) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowVehicleCrewInfo"; + }; + class GVAR(showNamesForAI) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowNamesForAI"; + }; + class GVAR(showCursorTagForVehicles) { + value = 0; + typeName = "BOOL"; + isClientSettable = 0; + }; + class GVAR(showSoundWaves) { + value = 1; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowSoundWaves"; + description = "$STR_ACE_NameTags_ShowSoundWaves_Desc"; + values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_NameTagSettings", "$STR_ACE_Common_AlwaysShowAll"}; + }; + class GVAR(PlayerNamesViewDistance) { + value = 5; + typeName = "SCALAR"; + isClientSettable = 0; + }; + class GVAR(PlayerNamesMaxAlpha) { + value = 0.8; + typeName = "SCALAR"; + isClientSettable = 0; + }; +}; diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp index b14873779c..a2d38254f1 100644 --- a/addons/nametags/config.cpp +++ b/addons/nametags/config.cpp @@ -13,64 +13,7 @@ class CfgPatches { }; #include "CfgEventHandlers.hpp" +#include "ACE_Settings.hpp" #include "CfgVehicles.hpp" -class ACE_Settings { - class GVAR(defaultNametagColor) { - value[] = {0.77, 0.51, 0.08, 1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_DefaultNametagColor"; - }; - class GVAR(showPlayerNames) { - value = 1; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowPlayerNames"; - description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; - values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_Enabled", "$STR_ACE_Common_OnlyCursor", "$STR_ACE_Common_OnlyOnKeypress", "$STR_ACE_Common_OnlyCursorAndKeyPress"}; - }; - class GVAR(showPlayerRanks) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowPlayerRanks"; - }; - class GVAR(showVehicleCrewInfo) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowVehicleCrewInfo"; - }; - class GVAR(showNamesForAI) { - value = 0; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowNamesForAI"; - }; - class GVAR(showCursorTagForVehicles) { - value = 0; - typeName = "BOOL"; - isClientSettable = 0; - }; - class GVAR(showSoundWaves) { - value = 1; - typeName = "SCALAR"; - isClientSettable = 1; - displayName = "$STR_ACE_NameTags_ShowSoundWaves"; - description = "$STR_ACE_NameTags_ShowSoundWaves_Desc"; - values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_NameTagSettings", "$STR_ACE_Common_AlwaysShowAll"}; - }; - class GVAR(PlayerNamesViewDistance) { - value = 5; - typeName = "SCALAR"; - isClientSettable = 0; - }; - class GVAR(PlayerNamesMaxAlpha) { - value = 0.8; - typeName = "SCALAR"; - isClientSettable = 0; - }; -}; - #include From 8a2a53ddac43ce53b981a7c6636cade69130ffdc Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 14 May 2015 23:26:37 +0200 Subject: [PATCH 02/13] Show player names module option added --- addons/nametags/ACE_Settings.hpp | 2 +- addons/nametags/CfgVehicles.hpp | 29 +++++++++++++++++++ addons/nametags/XEH_postInit.sqf | 8 +++-- .../nametags/functions/fnc_moduleNameTags.sqf | 3 +- addons/nametags/stringtable.xml | 16 +++++----- 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp index 986b5c187b..3aecd650b4 100644 --- a/addons/nametags/ACE_Settings.hpp +++ b/addons/nametags/ACE_Settings.hpp @@ -11,7 +11,7 @@ class ACE_Settings { isClientSettable = 1; displayName = "$STR_ACE_NameTags_ShowPlayerNames"; description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; - values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_Enabled", "$STR_ACE_Common_OnlyCursor", "$STR_ACE_Common_OnlyOnKeypress", "$STR_ACE_Common_OnlyCursorAndKeyPress"}; + values[] = {"$STR_ACE_NameTags_Disabled", "$STR_ACE_NameTags_Enabled", "$STR_ACE_NameTags_OnlyCursor", "$STR_ACE_NameTags_OnlyOnKeypress", "$STR_ACE_NameTags_OnlyCursorAndKeypress"}; }; class GVAR(showPlayerRanks) { value = 1; diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index fabd3b09cb..ad93cc1c27 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -12,6 +12,35 @@ class CfgVehicles { isGlobal = 1; icon = QUOTE(PATHTOF(UI\Icon_Module_NameTags_ca.paa)); class Arguments { + class showPlayerNames { + displayName = "$STR_ACE_NameTags_ShowPlayerNames"; + description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; + typeName = "SCALAR"; + defaultValue = 1; + class values { + class Disabled { + name = "$STR_ACE_NameTags_Disabled"; + value = 0; + }; + class Enabled { + default = 1; + name = "$STR_ACE_NameTags_Enabled"; + value = 1; + }; + class OnlyCursor { + name = "$STR_ACE_NameTags_OnlyCursor"; + value = 2; + }; + class OnlyOnKeypress { + name = "$STR_ACE_NameTags_OnlyOnKeypress"; + value = 3; + }; + class OnlyCursorAndKeypress { + name = "$STR_ACE_NameTags_OnlyCursorAndKeypress"; + value = 4; + }; + }; + }; class PlayerNamesViewDistance { displayName = "$STR_ACE_NameTags_PlayerNamesViewDistance_DisplayName"; description = "$STR_ACE_NameTags_PlayerNamesViewDistance_Description"; diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index cea2025dcc..1b649ac8a6 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -1,7 +1,9 @@ // by commy2 and esteldunedain #include "script_component.hpp" -[] call FUNC(initIsSpeaking); +if (QGVAR(showPlayerNames) > 0) then { + [] call FUNC(initIsSpeaking); +}; if (!hasInterface) exitWith {}; @@ -24,4 +26,6 @@ GVAR(ShowNamesTime) = -10; // Draw handle -addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; +if (QGVAR(showPlayerNames) > 0 || QGVAR(showVehicleCrewInfo)) then { + addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; +}; diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf index 1bbd4d8efb..0bee0e1a9c 100644 --- a/addons/nametags/functions/fnc_moduleNameTags.sqf +++ b/addons/nametags/functions/fnc_moduleNameTags.sqf @@ -20,9 +20,10 @@ if !(_activated) exitWith {}; GVAR(Module) = true; +[_logic, QGVAR(showPlayerNames), "showPlayerNames" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(PlayerNamesViewDistance), "PlayerNamesViewDistance" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(ShowNamesForAI), "ShowNamesForAI" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(showVehicleCrewInfo), "showVehicleCrewInfo" ] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(showCursorTagForVehicles), "showCursorTagForVehicles" ] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(showCursorTagForVehicles), "showCursorTagForVehicles" ] call EFUNC(common,readSettingFromModule); diag_log text "[ACE]: NameTags Module Initialized."; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index ef94140510..74b8372dc6 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -161,31 +161,31 @@ Moduł ten pozwala dostosować ustawienia i zasięg wyświetlania imion. - + Disabled Wyłączone - + Enabled Włączone - + Only Cursor Tylko pod kursorem - + Only On Keypress Tylko po wciśnięciu klawisza - - Only Cursor and KeyPress + + Only Cursor and Keypress Tylko pod kursorem i po wciśnięciu klawisza - + Use Nametag settings Użyj ustawień imion - + Always Show All Zawsze pokazuj wszystkie From 446ad378caba65feee37e3faceb9c264c03c163a Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 14 May 2015 23:27:41 +0200 Subject: [PATCH 03/13] Fixed variable incosistency, string added for new module option --- addons/nametags/ACE_Settings.hpp | 4 ++-- addons/nametags/CfgVehicles.hpp | 2 +- addons/nametags/functions/fnc_moduleNameTags.sqf | 4 ++-- addons/nametags/stringtable.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp index 3aecd650b4..47d5d00636 100644 --- a/addons/nametags/ACE_Settings.hpp +++ b/addons/nametags/ACE_Settings.hpp @@ -44,12 +44,12 @@ class ACE_Settings { description = "$STR_ACE_NameTags_ShowSoundWaves_Desc"; values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_NameTagSettings", "$STR_ACE_Common_AlwaysShowAll"}; }; - class GVAR(PlayerNamesViewDistance) { + class GVAR(playerNamesViewDistance) { value = 5; typeName = "SCALAR"; isClientSettable = 0; }; - class GVAR(PlayerNamesMaxAlpha) { + class GVAR(playerNamesMaxAlpha) { value = 0.8; typeName = "SCALAR"; isClientSettable = 0; diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index ad93cc1c27..f7d9a78429 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -41,7 +41,7 @@ class CfgVehicles { }; }; }; - class PlayerNamesViewDistance { + class playerNamesViewDistance { displayName = "$STR_ACE_NameTags_PlayerNamesViewDistance_DisplayName"; description = "$STR_ACE_NameTags_PlayerNamesViewDistance_Description"; typeName = "NUMBER"; diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf index 0bee0e1a9c..a1d652850d 100644 --- a/addons/nametags/functions/fnc_moduleNameTags.sqf +++ b/addons/nametags/functions/fnc_moduleNameTags.sqf @@ -21,9 +21,9 @@ if !(_activated) exitWith {}; GVAR(Module) = true; [_logic, QGVAR(showPlayerNames), "showPlayerNames" ] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(PlayerNamesViewDistance), "PlayerNamesViewDistance" ] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(playerNamesViewDistance), "playerNamesViewDistance" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(ShowNamesForAI), "ShowNamesForAI" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(showVehicleCrewInfo), "showVehicleCrewInfo" ] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(showCursorTagForVehicles), "showCursorTagForVehicles" ] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(showCursorTagForVehicles), "showCursorTagForVehicles" ] call EFUNC(common,readSettingFromModule); diag_log text "[ACE]: NameTags Module Initialized."; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 74b8372dc6..a1c8e4b0c0 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -190,7 +190,7 @@ Zawsze pokazuj wszystkie - + Show player names and its activation. Default: Enabled Opcja ta pozwala dostosować sposób wyświetlania imion nad głowami graczy. Opcja "Tylko po wciśnięciu klawisza" wyświetla imiona tylko przytrzymania klawisza "Modyfikator" dostępnego w menu ustawień addonów -> ACE3. From d7b617f49ebb9c0f31a8180e677a5021ed594a4d Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 14 May 2015 23:33:35 +0200 Subject: [PATCH 04/13] Stringtables fixed, variable macro fixed --- addons/nametags/ACE_Settings.hpp | 2 +- addons/nametags/XEH_postInit.sqf | 4 ++-- addons/nametags/stringtable.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp index 47d5d00636..56d8556cf8 100644 --- a/addons/nametags/ACE_Settings.hpp +++ b/addons/nametags/ACE_Settings.hpp @@ -42,7 +42,7 @@ class ACE_Settings { isClientSettable = 1; displayName = "$STR_ACE_NameTags_ShowSoundWaves"; description = "$STR_ACE_NameTags_ShowSoundWaves_Desc"; - values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_NameTagSettings", "$STR_ACE_Common_AlwaysShowAll"}; + values[] = {"$STR_ACE_NameTags_Disabled", "$STR_ACE_NameTags_NameTagSettings", "$STR_ACE_NameTags_AlwaysShowAll"}; }; class GVAR(playerNamesViewDistance) { value = 5; diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index 1b649ac8a6..c314a02bad 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -1,7 +1,7 @@ // by commy2 and esteldunedain #include "script_component.hpp" -if (QGVAR(showPlayerNames) > 0) then { +if (GVAR(showPlayerNames) > 0) then { [] call FUNC(initIsSpeaking); }; @@ -26,6 +26,6 @@ GVAR(ShowNamesTime) = -10; // Draw handle -if (QGVAR(showPlayerNames) > 0 || QGVAR(showVehicleCrewInfo)) then { +if (GVAR(showPlayerNames) > 0 || GVAR(showVehicleCrewInfo)) then { addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; }; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index a1c8e4b0c0..e5bc4e9e46 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -190,7 +190,7 @@ Zawsze pokazuj wszystkie - Show player names and its activation. Default: Enabled + Show player names and set their activation. Default: Enabled Opcja ta pozwala dostosować sposób wyświetlania imion nad głowami graczy. Opcja "Tylko po wciśnięciu klawisza" wyświetla imiona tylko przytrzymania klawisza "Modyfikator" dostępnego w menu ustawień addonów -> ACE3. From 22c5c03f6f8b4f000c11feb870d8fd082d588ed8 Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 15 May 2015 00:04:20 +0200 Subject: [PATCH 05/13] Removed redundant defaultValue and checks --- addons/nametags/CfgVehicles.hpp | 1 - addons/nametags/XEH_postInit.sqf | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index f7d9a78429..684ded21c9 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -16,7 +16,6 @@ class CfgVehicles { displayName = "$STR_ACE_NameTags_ShowPlayerNames"; description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; typeName = "SCALAR"; - defaultValue = 1; class values { class Disabled { name = "$STR_ACE_NameTags_Disabled"; diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index c314a02bad..d1bd3e932c 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -1,9 +1,7 @@ // by commy2 and esteldunedain #include "script_component.hpp" -if (GVAR(showPlayerNames) > 0) then { - [] call FUNC(initIsSpeaking); -}; +[] call FUNC(initIsSpeaking); if (!hasInterface) exitWith {}; @@ -26,6 +24,6 @@ GVAR(ShowNamesTime) = -10; // Draw handle -if (GVAR(showPlayerNames) > 0 || GVAR(showVehicleCrewInfo)) then { +if (GVAR(showPlayerNames) > 0) then { addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; }; From 62d7ea0b03ab2169ce6e67549ea0b4f08b13896d Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 15 May 2015 16:31:06 +0200 Subject: [PATCH 06/13] Fixed module entry not taking effect --- addons/nametags/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index 684ded21c9..5d430fdf93 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -15,7 +15,7 @@ class CfgVehicles { class showPlayerNames { displayName = "$STR_ACE_NameTags_ShowPlayerNames"; description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; - typeName = "SCALAR"; + typeName = "NUMBER"; class values { class Disabled { name = "$STR_ACE_NameTags_Disabled"; From a7cd36bc3e200e03f5a08ae04c256c0c3d524d87 Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 15 May 2015 16:52:27 +0200 Subject: [PATCH 07/13] Added Force setting --- addons/nametags/ACE_Settings.hpp | 6 ++++++ addons/nametags/CfgVehicles.hpp | 6 ++++++ addons/nametags/functions/fnc_moduleNameTags.sqf | 6 +++++- addons/nametags/stringtable.xml | 6 ++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp index 56d8556cf8..41c30b1da4 100644 --- a/addons/nametags/ACE_Settings.hpp +++ b/addons/nametags/ACE_Settings.hpp @@ -13,6 +13,12 @@ class ACE_Settings { description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; values[] = {"$STR_ACE_NameTags_Disabled", "$STR_ACE_NameTags_Enabled", "$STR_ACE_NameTags_OnlyCursor", "$STR_ACE_NameTags_OnlyOnKeypress", "$STR_ACE_NameTags_OnlyCursorAndKeypress"}; }; + class GVAR(showPlayerNamesForce) { + value = 0; + typeName = "BOOL"; + displayName = "$STR_ACE_NameTags_ShowPlayerNamesForce"; + description = "$STR_ACE_NameTags_ShowPlayerNamesForce_Desc"; + }; class GVAR(showPlayerRanks) { value = 1; typeName = "BOOL"; diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index 5d430fdf93..13e3ccc6fd 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -40,6 +40,12 @@ class CfgVehicles { }; }; }; + class showPlayerNamesForce { + displayName = "$STR_ACE_NameTags_ShowPlayerNamesForce"; + description = "$STR_ACE_NameTags_ShowPlayerNamesForce_Desc"; + typeName = "BOOL"; + defaultValue = 0; + }; class playerNamesViewDistance { displayName = "$STR_ACE_NameTags_PlayerNamesViewDistance_DisplayName"; description = "$STR_ACE_NameTags_PlayerNamesViewDistance_Description"; diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf index a1d652850d..bc9f6f909f 100644 --- a/addons/nametags/functions/fnc_moduleNameTags.sqf +++ b/addons/nametags/functions/fnc_moduleNameTags.sqf @@ -20,10 +20,14 @@ if !(_activated) exitWith {}; GVAR(Module) = true; -[_logic, QGVAR(showPlayerNames), "showPlayerNames" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(playerNamesViewDistance), "playerNamesViewDistance" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(ShowNamesForAI), "ShowNamesForAI" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(showVehicleCrewInfo), "showVehicleCrewInfo" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(showCursorTagForVehicles), "showCursorTagForVehicles" ] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(showPlayerNamesForce), "showPlayerNamesForce" ] call EFUNC(common,readSettingFromModule); + +if (GVAR(showPlayerNamesForce)) then { + [_logic, QGVAR(showPlayerNames), "showPlayerNames" ] call EFUNC(common,readSettingFromModule); +}; diag_log text "[ACE]: NameTags Module Initialized."; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index e5bc4e9e46..5e20f348a8 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -25,6 +25,12 @@ Mostra i nomi dei giocatori Показывать имена игроков (включить имена) + + Force show player names setting + + + Force name tags option, or by default allows players to choose it on their own. Default: Do Not Force + Show player name only on cursor (requires player names) Pokaż imiona graczy tylko pod kursorem (wymagana opcja Pokaż imiona graczy) From 2edbacd15b1af1e0889f41b86e3c6cc6dd4707ac Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 15 May 2015 17:16:55 +0200 Subject: [PATCH 08/13] Added SettingChanged EH and proper handling --- addons/nametags/XEH_postInit.sqf | 20 +++++++++++++++++-- .../nametags/functions/fnc_moduleNameTags.sqf | 2 +- addons/nametags/stringtable.xml | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index d1bd3e932c..73dbd955a8 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -23,7 +23,23 @@ GVAR(ShowNamesTime) = -10; [29, [false, false, false]], false] call cba_fnc_addKeybind; //LeftControl Key -// Draw handle +// Draw handle on start if set if (GVAR(showPlayerNames) > 0) then { - addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; + GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; }; + +// Set the EH which waits for a setting to be changed, so that the effect is shown immediately +if (!GVAR(showPlayerNamesForce)) then { + ["SettingChanged", { + PARAMS_2(_name,_value) + if (_name == QGVAR(showPlayerNames)) then { + if ((GVAR(showPlayerNames) > 0) && (_value == 0)) then { + removeMissionEventHandler ["Draw3D", GVAR(drawHandler)]; + GVAR(drawHandler) = nil; + }; + if ((GVAR(showPlayerNames) == 0) && (_value > 0)) then { + GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; + }; + }; + }] call ace_common_fnc_addEventHandler; +}; \ No newline at end of file diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf index bc9f6f909f..12f03e61ca 100644 --- a/addons/nametags/functions/fnc_moduleNameTags.sqf +++ b/addons/nametags/functions/fnc_moduleNameTags.sqf @@ -30,4 +30,4 @@ if (GVAR(showPlayerNamesForce)) then { [_logic, QGVAR(showPlayerNames), "showPlayerNames" ] call EFUNC(common,readSettingFromModule); }; -diag_log text "[ACE]: NameTags Module Initialized."; +diag_log format ["[ACE]: NameTags Module Initialized. Forced Name Tags Setting: %1",GVAR(showPlayerNamesForce)]; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 5e20f348a8..df0f42ec79 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -26,7 +26,7 @@ Показывать имена игроков (включить имена) - Force show player names setting + Force names setting Force name tags option, or by default allows players to choose it on their own. Default: Do Not Force From 1ccc7e1e0ace8f2bc6606bfb56e10d3a96d39285 Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 15 May 2015 17:44:58 +0200 Subject: [PATCH 09/13] CBA Macro for addEventHandler --- addons/nametags/XEH_postInit.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index 73dbd955a8..b7a28b7f6c 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -41,5 +41,5 @@ if (!GVAR(showPlayerNamesForce)) then { GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; }; }; - }] call ace_common_fnc_addEventHandler; -}; \ No newline at end of file + }] call EFUNC(common,addEventHandler); +}; From 02b9df1bc31e54bee23ac9a0d2825e0ed723b56a Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 15 May 2015 18:13:10 +0200 Subject: [PATCH 10/13] Fixed client setting Draw3D installation/removal handling --- addons/nametags/XEH_postInit.sqf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index b7a28b7f6c..1cf8b6b800 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -33,12 +33,13 @@ if (!GVAR(showPlayerNamesForce)) then { ["SettingChanged", { PARAMS_2(_name,_value) if (_name == QGVAR(showPlayerNames)) then { - if ((GVAR(showPlayerNames) > 0) && (_value == 0)) then { - removeMissionEventHandler ["Draw3D", GVAR(drawHandler)]; - GVAR(drawHandler) = nil; - }; - if ((GVAR(showPlayerNames) == 0) && (_value > 0)) then { + if (isNil(QGVAR(drawHandler)) && {_value > 0}) then { GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; + } else { + if (_value == 0) then { + removeMissionEventHandler ["Draw3D", GVAR(drawHandler)]; + GVAR(drawHandler) = nil; + }; }; }; }] call EFUNC(common,addEventHandler); From 7c96c12bd59574b81e231d605f5cd86de700bdc5 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 16 May 2015 00:07:38 +0200 Subject: [PATCH 11/13] Made forced settings through module in original entry, Reworked Draw3D handling, Some strings cleanup --- addons/nametags/ACE_Settings.hpp | 8 +---- addons/nametags/CfgVehicles.hpp | 32 +++++++++--------- addons/nametags/XEH_postInit.sqf | 33 +++++++------------ addons/nametags/XEH_preInit.sqf | 1 + .../nametags/functions/fnc_moduleNameTags.sqf | 8 ++--- .../nametags/functions/fnc_updateSettings.sqf | 26 +++++++++++++++ addons/nametags/stringtable.xml | 29 ++++++++-------- 7 files changed, 74 insertions(+), 63 deletions(-) create mode 100644 addons/nametags/functions/fnc_updateSettings.sqf diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp index 41c30b1da4..72ae5c27df 100644 --- a/addons/nametags/ACE_Settings.hpp +++ b/addons/nametags/ACE_Settings.hpp @@ -11,13 +11,7 @@ class ACE_Settings { isClientSettable = 1; displayName = "$STR_ACE_NameTags_ShowPlayerNames"; description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; - values[] = {"$STR_ACE_NameTags_Disabled", "$STR_ACE_NameTags_Enabled", "$STR_ACE_NameTags_OnlyCursor", "$STR_ACE_NameTags_OnlyOnKeypress", "$STR_ACE_NameTags_OnlyCursorAndKeypress"}; - }; - class GVAR(showPlayerNamesForce) { - value = 0; - typeName = "BOOL"; - displayName = "$STR_ACE_NameTags_ShowPlayerNamesForce"; - description = "$STR_ACE_NameTags_ShowPlayerNamesForce_Desc"; + values[] = {"$STR_ACE_NameTags_Disabled", "$STR_ACE_NameTags_Enabled", "$STR_ACE_NameTags_OnlyCursor", "$STR_ACE_NameTags_OnlyKeypress", "$STR_ACE_NameTags_OnlyCursorAndKeypress"}; }; class GVAR(showPlayerRanks) { value = 1; diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp index 13e3ccc6fd..7c2661efbe 100644 --- a/addons/nametags/CfgVehicles.hpp +++ b/addons/nametags/CfgVehicles.hpp @@ -17,35 +17,33 @@ class CfgVehicles { description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; typeName = "NUMBER"; class values { - class Disabled { - name = "$STR_ACE_NameTags_Disabled"; + class DoNotForce { + default = 1; + name = "$STR_ACE_NameTags_DoNotForce"; + value = -1; + }; + class ForceHide { + name = "$STR_ACE_NameTags_ForceHide"; value = 0; }; - class Enabled { - default = 1; - name = "$STR_ACE_NameTags_Enabled"; + class ForceShow { + name = "$STR_ACE_NameTags_ForceShow"; value = 1; }; - class OnlyCursor { - name = "$STR_ACE_NameTags_OnlyCursor"; + class ForceShowOnlyCursor { + name = "$STR_ACE_NameTags_ForceShowOnlyCursor"; value = 2; }; - class OnlyOnKeypress { - name = "$STR_ACE_NameTags_OnlyOnKeypress"; + class ForceShowOnlyKeypress { + name = "$STR_ACE_NameTags_ForceShowOnlyKeypress"; value = 3; }; - class OnlyCursorAndKeypress { - name = "$STR_ACE_NameTags_OnlyCursorAndKeypress"; + class ForceShowOnlyCursorAndKeypress { + name = "$STR_ACE_NameTags_ForceShowOnlyCursorAndKeypress"; value = 4; }; }; }; - class showPlayerNamesForce { - displayName = "$STR_ACE_NameTags_ShowPlayerNamesForce"; - description = "$STR_ACE_NameTags_ShowPlayerNamesForce_Desc"; - typeName = "BOOL"; - defaultValue = 0; - }; class playerNamesViewDistance { displayName = "$STR_ACE_NameTags_PlayerNamesViewDistance_DisplayName"; description = "$STR_ACE_NameTags_PlayerNamesViewDistance_Description"; diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index 1cf8b6b800..a9ac8195dd 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -5,7 +5,7 @@ if (!hasInterface) exitWith {}; -GVAR(ShowNamesTime) = -10; +GVAR(showNamesTime) = -10; // Add keybinds ["ACE3 Common", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames", @@ -14,7 +14,7 @@ GVAR(ShowNamesTime) = -10; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; // Statement - GVAR(ShowNamesTime) = time; + GVAR(showNamesTime) = time; if (call FUNC(canShow)) then{ call FUNC(doShow); }; // Return false so it doesn't block other actions false @@ -23,24 +23,13 @@ GVAR(ShowNamesTime) = -10; [29, [false, false, false]], false] call cba_fnc_addKeybind; //LeftControl Key -// Draw handle on start if set -if (GVAR(showPlayerNames) > 0) then { - GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; -}; +// Draw handle +call FUNC(updateSettings); -// Set the EH which waits for a setting to be changed, so that the effect is shown immediately -if (!GVAR(showPlayerNamesForce)) then { - ["SettingChanged", { - PARAMS_2(_name,_value) - if (_name == QGVAR(showPlayerNames)) then { - if (isNil(QGVAR(drawHandler)) && {_value > 0}) then { - GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; - } else { - if (_value == 0) then { - removeMissionEventHandler ["Draw3D", GVAR(drawHandler)]; - GVAR(drawHandler) = nil; - }; - }; - }; - }] call EFUNC(common,addEventHandler); -}; +// Change settings accordingly when they are changed +["SettingChanged", { + PARAMS_1(_name); + if (_name == QGVAR(showPlayerNames)) then { + call FUNC(updateSettings); + }; +}] call EFUNC(common,addEventHandler); diff --git a/addons/nametags/XEH_preInit.sqf b/addons/nametags/XEH_preInit.sqf index f3c9a97cba..51b926cbb3 100644 --- a/addons/nametags/XEH_preInit.sqf +++ b/addons/nametags/XEH_preInit.sqf @@ -10,5 +10,6 @@ PREP(initIsSpeaking); PREP(moduleNameTags); PREP(onDraw3d); PREP(setText); +PREP(updateSettings); ADDON = true; diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf index 12f03e61ca..7373d85de1 100644 --- a/addons/nametags/functions/fnc_moduleNameTags.sqf +++ b/addons/nametags/functions/fnc_moduleNameTags.sqf @@ -21,13 +21,13 @@ if !(_activated) exitWith {}; GVAR(Module) = true; [_logic, QGVAR(playerNamesViewDistance), "playerNamesViewDistance" ] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(ShowNamesForAI), "ShowNamesForAI" ] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(showNamesForAI), "showNamesForAI" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(showVehicleCrewInfo), "showVehicleCrewInfo" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(showCursorTagForVehicles), "showCursorTagForVehicles" ] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(showPlayerNamesForce), "showPlayerNamesForce" ] call EFUNC(common,readSettingFromModule); -if (GVAR(showPlayerNamesForce)) then { +// Do Not Force - read module setting only non-default is set due to using SCALAR +if ((_logic getVariable "showPlayerNames") != -1) then { [_logic, QGVAR(showPlayerNames), "showPlayerNames" ] call EFUNC(common,readSettingFromModule); }; -diag_log format ["[ACE]: NameTags Module Initialized. Forced Name Tags Setting: %1",GVAR(showPlayerNamesForce)]; +diag_log text "[ACE]: NameTags Module Initialized."; diff --git a/addons/nametags/functions/fnc_updateSettings.sqf b/addons/nametags/functions/fnc_updateSettings.sqf new file mode 100644 index 0000000000..237eb438fd --- /dev/null +++ b/addons/nametags/functions/fnc_updateSettings.sqf @@ -0,0 +1,26 @@ +/* + * Author: Jonpas + * Dynamically adds and removes Draw3D based on settings on run-time. + * + * Arguments: + * None + * + * Return Value: + * None + * + * Example: + * call ace_nametags_fnc_updateSettings + * + * Public: No + */ + +#include "script_component.hpp" + +if (isNil QGVAR(drawHandler) && {GVAR(showPlayerNames) != 0}) then { + GVAR(drawHandler) = addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}]; +} else { + if (!isNil QGVAR(drawHandler) && {GVAR(showPlayerNames) == 0}) then { + removeMissionEventHandler ["Draw3D", GVAR(drawHandler)]; + GVAR(drawHandler) = nil; + }; +}; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index df0f42ec79..7aa531fc28 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -25,12 +25,6 @@ Mostra i nomi dei giocatori Показывать имена игроков (включить имена) - - Force names setting - - - Force name tags option, or by default allows players to choose it on their own. Default: Do Not Force - Show player name only on cursor (requires player names) Pokaż imiona graczy tylko pod kursorem (wymagana opcja Pokaż imiona graczy) @@ -144,7 +138,7 @@ Wymuś ukrycie - Force show + Force Show Wymuś wyświetlanie @@ -164,7 +158,7 @@ Pokazuj imię dowódcy pojazdu nad pojazdem (tylko jeżeli klient ma włączone imiona graczy). Domyślnie: Nie - + This module allows you to customize settings and range of Name Tags. Moduł ten pozwala dostosować ustawienia i zasięg wyświetlania imion. @@ -176,17 +170,26 @@ Włączone - Only Cursor + Only on Cursor Tylko pod kursorem - - Only On Keypress + + Only on Keypress Tylko po wciśnięciu klawisza - Only Cursor and Keypress + Only on Cursor and Keypress Tylko pod kursorem i po wciśnięciu klawisza + + Force Show Only on Cursor + + + Force Show Only on Keypress + + + Force Show Only on Cursor and Keypress + Use Nametag settings Użyj ustawień imion @@ -200,7 +203,7 @@ Opcja ta pozwala dostosować sposób wyświetlania imion nad głowami graczy. Opcja "Tylko po wciśnięciu klawisza" wyświetla imiona tylko przytrzymania klawisza "Modyfikator" dostępnego w menu ustawień addonów -> ACE3. - + Effect of sound waves above the heads of speaking players after holding the PTT key. This option works with TFAR and ACRE2. Opcja ta pozwala dostosować sposób wyświetlania efektu fal dźwiękowych nad głowami mówiących graczy, wyświetlanych po przytrzymaniu klawisza PTT. Opcja ta współpracuje z TFAR oraz ACRE2. From bffe58efd6a331ca423429e318db4dd5e6665185 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 16 May 2015 00:22:23 +0200 Subject: [PATCH 12/13] Name Tags cleanup --- addons/nametags/functions/common.hpp | 12 ++--- addons/nametags/functions/fnc_canShow.sqf | 29 +++++----- addons/nametags/functions/fnc_doShow.sqf | 26 ++++----- .../functions/fnc_drawNameTagIcon.sqf | 14 +++-- .../nametags/functions/fnc_getVehicleData.sqf | 53 ++++++++----------- .../nametags/functions/fnc_initIsSpeaking.sqf | 6 +-- addons/nametags/functions/fnc_onDraw3d.sqf | 15 ++++++ addons/nametags/functions/fnc_setText.sqf | 33 ++++++------ .../nametags/functions/fnc_updateSettings.sqf | 1 - 9 files changed, 100 insertions(+), 89 deletions(-) diff --git a/addons/nametags/functions/common.hpp b/addons/nametags/functions/common.hpp index caa7a3e982..6aeb24fc5a 100644 --- a/addons/nametags/functions/common.hpp +++ b/addons/nametags/functions/common.hpp @@ -1,12 +1,8 @@ /* - Author: aeroson - - Description: - Images, index in images and order of roles. - Defined number also implies order, lower number shows more on top of the list. -*/ - -#include "script_component.hpp" + * Author: aeroson + * Images, index in images and order of roles. + * Defined number also implies order, lower number shows more on top of the list. + */ #define PILOT 0 #define DRIVER 1 diff --git a/addons/nametags/functions/fnc_canShow.sqf b/addons/nametags/functions/fnc_canShow.sqf index 0e187fee0f..b53f50c93e 100644 --- a/addons/nametags/functions/fnc_canShow.sqf +++ b/addons/nametags/functions/fnc_canShow.sqf @@ -1,19 +1,22 @@ /* - Author: aeroson - - Description: - Might be called several times a second - - Parameters: - None - - Returns: - true if CrewInfo can be shown, false otherwise -*/ - + * Author: aeroson + * Checks if crew info can be shown. + * Might be called several times a second. + * + * Arguments: + * None + * + * Return Value: + * Can show Crew Info + * + * Example: + * call ace_nametags_fnc_doShow + * + * Public: No + */ #include "script_component.hpp" -private["_player"]; +private ["_player"]; _player = ACE_player; diff --git a/addons/nametags/functions/fnc_doShow.sqf b/addons/nametags/functions/fnc_doShow.sqf index 16a6329347..1b7323921f 100644 --- a/addons/nametags/functions/fnc_doShow.sqf +++ b/addons/nametags/functions/fnc_doShow.sqf @@ -1,16 +1,18 @@ /* - Author: aeroson - - Description: - Shows the actual text and sets text the crew info - - Parameters: - None - - Returns: - Nothing -*/ - + * Author: aeroson + * Shows the actual text and sets text the crew info. + * + * Arguments: + * None + * + * Return Value: + * None + * + * Example: + * call ace_nametags_fnc_doShow + * + * Public: No + */ #include "script_component.hpp" #include "common.hpp"; diff --git a/addons/nametags/functions/fnc_drawNameTagIcon.sqf b/addons/nametags/functions/fnc_drawNameTagIcon.sqf index 6a7db7d5ac..58f5c8e014 100644 --- a/addons/nametags/functions/fnc_drawNameTagIcon.sqf +++ b/addons/nametags/functions/fnc_drawNameTagIcon.sqf @@ -1,17 +1,21 @@ /* * Author: commy2, esteldunedain - * * Draw the nametag and rank icon. * - * Argument: + * Arguments: * 0: Unit (Player) * 1: Target - * 2: alpha (Number) - * 4: Height offset (Number) + * 2: Alpha + * 4: Height offset * 5: Draw Type * * Return value: - * None. + * None + * + * Example: + * [ACE_player, _target, _alpha, _distance * 0.026, _icon] call ace_nametags_fnc_drawNameTagIcon + * + * Public: No */ #include "script_component.hpp" diff --git a/addons/nametags/functions/fnc_getVehicleData.sqf b/addons/nametags/functions/fnc_getVehicleData.sqf index 1538c345a1..6d83b0f573 100644 --- a/addons/nametags/functions/fnc_getVehicleData.sqf +++ b/addons/nametags/functions/fnc_getVehicleData.sqf @@ -1,46 +1,38 @@ /* - Author: aeroson - - Description: - Gathers and caches data needed by AGM_CrewInfo_fnc_doShow - What really does make difference for the engine is simulation of CfgAmmo - Priority of roles is: driver/pilot, gunner, copilot, commander, ffv, cargo - - Parameters: - None - - Returns: - [ - Is vehicle inherited from Air ? - Array categorizing each vehicle's turret - ] -*/ - + * Author: aeroson + * Gathers and caches data needed by AGM_CrewInfo_fnc_doShow. + * What really does make difference for the engine is simulation of CfgAmmo. + * Priority of roles is: driver/pilot, gunner, copilot, commander, FFV, cargo. + * + * Arguments: + * None + * + * Return Value: + * Data + * 0: Vehicle inherits from Air + * 1: Categorized vehicle's turrets + * + * Example: + * call ace_nametags_fnc_updateSettings + * + * Public: No + */ #include "script_component.hpp" #include "common.hpp"; +private ["_type", "_varName", "_data", "_isAir", "_config", "_fnc_addTurret", "_fnc_addTurretUnit"]; -private ["_type", "_varName", "_data"]; - -_type = _this select 0; +PARAMS_1(_type); _varName = format ["ACE_CrewInfo_Cache_%1", _type]; _data = + (uiNamespace getVariable _varName); -if (!isNil "_data") exitWith { - _data -}; +if (!isNil "_data") exitWith {_data}; _data = []; - - - -private ["_isAir", "_config", "_fnc_addTurret", "_fnc_addTurretUnit"]; - _isAir = _type isKindOf "Air"; _fnc_addTurretUnit = { - private ["_config", "_path", "_role", "_simulationEmpty", "_simulationLaserDesignate", "_simulationOther", "_magazine", "_ammo", "_simulation"]; _config = _this select 0; @@ -83,7 +75,6 @@ _fnc_addTurretUnit = { }; _data pushBack [_path, _role]; - }; @@ -108,9 +99,7 @@ _fnc_addTurret = { } else { _offset = _offset + 1; }; - }; - }; diff --git a/addons/nametags/functions/fnc_initIsSpeaking.sqf b/addons/nametags/functions/fnc_initIsSpeaking.sqf index c6087541a8..897d223930 100644 --- a/addons/nametags/functions/fnc_initIsSpeaking.sqf +++ b/addons/nametags/functions/fnc_initIsSpeaking.sqf @@ -4,13 +4,13 @@ * Compatiblity with TFR/ACRE and Arma's VON * * Arguments: - * NONE + * None * * Return Value: - * NONE + * None * * Example: - * [] call ACE_nametags_fnc_initIsSpeaking + * [] call ace_nametags_fnc_initIsSpeaking * * Public: No */ diff --git a/addons/nametags/functions/fnc_onDraw3d.sqf b/addons/nametags/functions/fnc_onDraw3d.sqf index 9efc70aeb9..e88f606c05 100644 --- a/addons/nametags/functions/fnc_onDraw3d.sqf +++ b/addons/nametags/functions/fnc_onDraw3d.sqf @@ -1,3 +1,18 @@ +/* + * Author: + * Draws names and icons. + * + * Arguments: + * None + * + * Return Value: + * None + * + * Example: + * call ace_nametags_fnc_onDraw3d + * + * Public: No + */ #include "script_component.hpp" private ["_onKeyPressAlphaMax", "_defaultIcon", "_distance", "_alpha", "_icon", "_targets", "_pos2", "_vecy", "_relPos", "_projDist", "_pos", "_target"]; diff --git a/addons/nametags/functions/fnc_setText.sqf b/addons/nametags/functions/fnc_setText.sqf index e7d1b748b1..33112c31d0 100644 --- a/addons/nametags/functions/fnc_setText.sqf +++ b/addons/nametags/functions/fnc_setText.sqf @@ -1,25 +1,28 @@ -/* - Author: aeroson - - Description: - Sets the text on the dialog - - Parameters: - None - - Returns: - Nothing -*/ - +/* + * Author: aeroson + * Sets the text on the dialog. + * + * Arguments: + * 0: Text + * + * Return Value: + * None + * + * Example: + * call ace_nametags_fnc_setText + * + * Public: No + */ #include "script_component.hpp" #define TextIDC 11123 -private["_text", "_ctrl"]; +PARAMS_1(_text); + +private["_ctrl"]; disableSerialization; -_text = _this select 0; _ctrl = (uiNamespace getVariable QGVAR(dialog)) displayCtrl TextIDC; _ctrl ctrlSetStructuredText parseText _text; _ctrl ctrlCommit 0; diff --git a/addons/nametags/functions/fnc_updateSettings.sqf b/addons/nametags/functions/fnc_updateSettings.sqf index 237eb438fd..76110b4f79 100644 --- a/addons/nametags/functions/fnc_updateSettings.sqf +++ b/addons/nametags/functions/fnc_updateSettings.sqf @@ -13,7 +13,6 @@ * * Public: No */ - #include "script_component.hpp" if (isNil QGVAR(drawHandler) && {GVAR(showPlayerNames) != 0}) then { From c0c4414ec046556c9899489a37328d7d8f603613 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 16 May 2015 01:35:48 +0200 Subject: [PATCH 13/13] Name tags Draw3D variable names consistency --- addons/nametags/functions/fnc_onDraw3d.sqf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/nametags/functions/fnc_onDraw3d.sqf b/addons/nametags/functions/fnc_onDraw3d.sqf index e88f606c05..ae80e7e992 100644 --- a/addons/nametags/functions/fnc_onDraw3d.sqf +++ b/addons/nametags/functions/fnc_onDraw3d.sqf @@ -21,7 +21,7 @@ private ["_onKeyPressAlphaMax", "_defaultIcon", "_distance", "_alpha", "_icon", if (!alive ACE_player) exitWith {}; _onKeyPressAlphaMax = if ((GVAR(showPlayerNames) in [3,4])) then { - 2 + (GVAR(ShowNamesTime) - time); //after release 1 second of full opacity, 1 second of fading to 0 + 2 + (GVAR(showNamesTime) - time); //after release 1 second of full opacity, 1 second of fading to 0 } else { 1 }; @@ -41,10 +41,10 @@ if (GVAR(showCursorTagForVehicles) && {_onKeyPressAlphaMax > 0}) then { if ((!isNull _target) && {(side (group _target)) == (side (group ACE_player))} && {_target != ACE_player} && - {GVAR(ShowNamesForAI) || {[_target] call EFUNC(common,isPlayer)}} && + {GVAR(showNamesForAI) || {[_target] call EFUNC(common,isPlayer)}} && {!(_target getVariable ["ACE_hideName", false])}) then { _distance = ACE_player distance _target; - _alpha = ((1 - 0.2 * (_distance - GVAR(PlayerNamesViewDistance))) min 1) * GVAR(PlayerNamesMaxAlpha); + _alpha = ((1 - 0.2 * (_distance - GVAR(playerNamesViewDistance))) min 1) * GVAR(playerNamesMaxAlpha); _alpha = _alpha min _onKeyPressAlphaMax; [ACE_player, _target, _alpha, _distance * 0.026, _defaultIcon] call FUNC(drawNameTagIcon); }; @@ -58,10 +58,10 @@ if ((GVAR(showPlayerNames) in [2,4]) && {_onKeyPressAlphaMax > 0}) then { {_target isKindOf "CAManBase"} && {(side (group _target)) == (side (group ACE_player))} && {_target != ACE_player} && - {GVAR(ShowNamesForAI) || {[_target] call EFUNC(common,isPlayer)}} && + {GVAR(showNamesForAI) || {[_target] call EFUNC(common,isPlayer)}} && {!(_target getVariable ["ACE_hideName", false])}) then { _distance = ACE_player distance _target; - _alpha = ((1 - 0.2 * (_distance - GVAR(PlayerNamesViewDistance))) min 1) * GVAR(PlayerNamesMaxAlpha); + _alpha = ((1 - 0.2 * (_distance - GVAR(playerNamesViewDistance))) min 1) * GVAR(playerNamesMaxAlpha); _alpha = _alpha min _onKeyPressAlphaMax; _icon = ICON_NONE; if (GVAR(showSoundWaves) == 2) then { //icon will be drawn below, so only show name here @@ -76,7 +76,7 @@ if ((GVAR(showPlayerNames) in [2,4]) && {_onKeyPressAlphaMax > 0}) then { if (((GVAR(showPlayerNames) in [1,3]) && {_onKeyPressAlphaMax > 0}) || {GVAR(showSoundWaves) == 2}) then { _pos = positionCameraToWorld [0, 0, 0]; - _targets = _pos nearObjects ["CAManBase", GVAR(PlayerNamesViewDistance) + 5]; + _targets = _pos nearObjects ["CAManBase", GVAR(playerNamesViewDistance) + 5]; if (!surfaceIsWater _pos) then { _pos = ATLtoASL _pos; @@ -101,7 +101,7 @@ if (((GVAR(showPlayerNames) in [1,3]) && {_onKeyPressAlphaMax > 0}) || {GVAR(sho if ((_icon != ICON_NONE) && {(side (group _target)) == (side (group ACE_player))} && {_target != ACE_player} && - {GVAR(ShowNamesForAI) || {[_target] call EFUNC(common,isPlayer)}} && + {GVAR(showNamesForAI) || {[_target] call EFUNC(common,isPlayer)}} && {!(_target getVariable ["ACE_hideName", false])}) then { if (lineIntersects [_pos, (visiblePositionASL _target) vectorAdd [0,0,1], vehicle ACE_player, _target]) exitWith {}; // Check if there is line of sight @@ -109,7 +109,7 @@ if (((GVAR(showPlayerNames) in [1,3]) && {_onKeyPressAlphaMax > 0}) || {GVAR(sho _distance = vectorMagnitude _relPos; _projDist = _relPos vectorDistance (_vecy vectorMultiply (_relPos vectorDotProduct _vecy)); - _alpha = ((1 - 0.2 * (_distance - GVAR(PlayerNamesViewDistance))) min (1 - 0.15 * (_projDist * 5 - _distance - 3)) min 1) * GVAR(PlayerNamesMaxAlpha); + _alpha = ((1 - 0.2 * (_distance - GVAR(playerNamesViewDistance))) min (1 - 0.15 * (_projDist * 5 - _distance - 3)) min 1) * GVAR(playerNamesMaxAlpha); if ((GVAR(showSoundWaves) == 2) && {([_target] call FUNC(isSpeaking)) && {(vehicle _target) == _target}}) then { _alpha = 1;