Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Medical - Add new setting to hide self-interaction actions #6756

Merged
merged 2 commits into from
Jan 12, 2019
Merged

Medical - Add new setting to hide self-interaction actions #6756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f6025c
Medical - Hide self interaction menu if disabled
PabstMirror Jan 2, 2019
9738f1a
Add new setting
PabstMirror Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/medical/ACE_Medical_SelfActions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(menuTypeStyleSelf));
icon = QPATHTOF(UI\icons\medical_cross.paa);

class ACE_Head {
Expand Down
10 changes: 9 additions & 1 deletion addons/medical/ACE_Settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,15 @@ 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(menuTypeStyleSelf) {
category = CSTRING(Category_Medical);
displayName = CSTRING(menuTypeDisplaySelf);
description = CSTRING(menuTypeDescriptionSelf);
typeName = "BOOL";
value = 1;
isClientSettable = 1;
};
class GVAR(delayUnconCaptive) {
Expand Down
6 changes: 6 additions & 0 deletions addons/medical/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3161,6 +3161,12 @@
<Chinesesimp>选择你喜欢的选单样式; 预设为3D选项或放射状</Chinesesimp>
<Chinese>選擇你喜歡的選單樣式; 預設為3D選項或放射狀</Chinese>
</Key>
<Key ID="STR_ACE_Medical_menuTypeDisplaySelf">
<English>Show medical interaction for self</English>
</Key>
<Key ID="STR_ACE_Medical_menuTypeDisplaySelf">
<English>Show the self interaction medical actions</English>
</Key>
<Key ID="STR_ACE_Medical_useSelection">
<English>Selections (3d)</English>
<Polish>Pozycje (3D)</Polish>
Expand Down