From 4f6025cbb1f0437c59c6a5290378ce311acf9791 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 1 Jan 2019 19:26:48 -0600 Subject: [PATCH 1/2] Medical - Hide self interaction menu if disabled --- addons/medical/ACE_Medical_SelfActions.hpp | 2 +- addons/medical/ACE_Settings.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/ACE_Medical_SelfActions.hpp b/addons/medical/ACE_Medical_SelfActions.hpp index 9f01f08908a..81d270f55f6 100644 --- a/addons/medical/ACE_Medical_SelfActions.hpp +++ b/addons/medical/ACE_Medical_SelfActions.hpp @@ -3,7 +3,7 @@ class Medical { runOnHover = 1; exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); - condition = "true"; + condition = QUOTE(GVAR(menuTypeStyle) != 2); icon = QPATHTOF(UI\icons\medical_cross.paa); class ACE_Head { diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index ee393c37e72..bf50d1f77bc 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -299,7 +299,7 @@ class ACE_Settings { description = CSTRING(menuTypeDescription); typeName = "SCALAR"; value = 0; - values[] = {CSTRING(useSelection), CSTRING(useRadial), "Disabled"}; + values[] = {CSTRING(useSelection), CSTRING(useRadial), ECSTRING(common,Disabled)}; isClientSettable = 1; }; class GVAR(delayUnconCaptive) { From 9738f1ae550e168eb3f142e3445f95825b649988 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 11 Jan 2019 11:09:23 -0600 Subject: [PATCH 2/2] Add new setting --- addons/medical/ACE_Medical_SelfActions.hpp | 2 +- addons/medical/ACE_Settings.hpp | 8 ++++++++ addons/medical/stringtable.xml | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/addons/medical/ACE_Medical_SelfActions.hpp b/addons/medical/ACE_Medical_SelfActions.hpp index 81d270f55f6..b63fd8fb429 100644 --- a/addons/medical/ACE_Medical_SelfActions.hpp +++ b/addons/medical/ACE_Medical_SelfActions.hpp @@ -3,7 +3,7 @@ class Medical { runOnHover = 1; exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); - condition = QUOTE(GVAR(menuTypeStyle) != 2); + condition = QUOTE(GVAR(menuTypeStyleSelf)); icon = QPATHTOF(UI\icons\medical_cross.paa); class ACE_Head { diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index bf50d1f77bc..18126487835 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -302,6 +302,14 @@ class ACE_Settings { values[] = {CSTRING(useSelection), CSTRING(useRadial), ECSTRING(common,Disabled)}; isClientSettable = 1; }; + class GVAR(menuTypeStyleSelf) { + category = CSTRING(Category_Medical); + displayName = CSTRING(menuTypeDisplaySelf); + description = CSTRING(menuTypeDescriptionSelf); + typeName = "BOOL"; + value = 1; + isClientSettable = 1; + }; class GVAR(delayUnconCaptive) { category = CSTRING(Category_Medical); displayName = CSTRING(MedicalSettings_delayUnconCaptive_DisplayName); diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index d78ae5c7868..6a9d52fa6d8 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -3161,6 +3161,12 @@ 选择你喜欢的选单样式; 预设为3D选项或放射状 選擇你喜歡的選單樣式; 預設為3D選項或放射狀 + + Show medical interaction for self + + + Show the self interaction medical actions + Selections (3d) Pozycje (3D)