epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8752 from obrakmann/optional-target-lines

Browse Source 
Added option to turn off rendering of target lines in the settings
This commit is contained in:
Matthias Mailänder
2015-07-20 22:05:05 +02:00
parent c6c6a9ff89 ab3ab6f230
commit a0dc38c252
5 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Settings.cs
View File

@@ -140,6 +140,7 @@ namespace OpenRA
public bool UseClassicMouseStyle = false; public bool UseClassicMouseStyle = false;
public bool AlwaysShowStatusBars = false; public bool AlwaysShowStatusBars = false;
public bool TeamHealthColors = false; public bool TeamHealthColors = false;
public bool DrawTargetLine = true;
public bool AllowDownloading = true; public bool AllowDownloading = true;
public string MapRepository = "http://resource.openra.net/map/"; public string MapRepository = "http://resource.openra.net/map/";

3
OpenRA.Game/Traits/DrawLineToTarget.cs
View File

@@ -64,6 +64,9 @@ namespace OpenRA.Traits
if ((lifetime <= 0 || --lifetime <= 0) && !force) if ((lifetime <= 0 || --lifetime <= 0) && !force)
yield break; yield break;
if (!(force || Game.Settings.Game.DrawTargetLine))
yield break;
if (targets == null || targets.Count == 0) if (targets == null || targets.Count == 0)
yield break; yield break;

1
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -154,6 +154,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
BindCheckboxPref(panel, "FRAME_LIMIT_CHECKBOX", ds, "CapFramerate"); BindCheckboxPref(panel, "FRAME_LIMIT_CHECKBOX", ds, "CapFramerate");
BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap"); BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap");
BindCheckboxPref(panel, "ALWAYS_SHOW_STATUS_BARS_CHECKBOX", gs, "AlwaysShowStatusBars"); BindCheckboxPref(panel, "ALWAYS_SHOW_STATUS_BARS_CHECKBOX", gs, "AlwaysShowStatusBars");
BindCheckboxPref(panel, "DISPLAY_TARGET_LINES_CHECKBOX", gs, "DrawTargetLine");
BindCheckboxPref(panel, "TEAM_HEALTH_COLORS_CHECKBOX", gs, "TeamHealthColors"); BindCheckboxPref(panel, "TEAM_HEALTH_COLORS_CHECKBOX", gs, "TeamHealthColors");
var languageDropDownButton = panel.Get<DropDownButtonWidget>("LANGUAGE_DROPDOWNBUTTON"); var languageDropDownButton = panel.Get<DropDownButtonWidget>("LANGUAGE_DROPDOWNBUTTON");

7
mods/cnc/chrome/settings.yaml
View File

@@ -190,6 +190,13 @@ Container@SETTINGS_PANEL:
Height: 20 Height: 20
Font: Regular Font: Regular
Text: Always Show Status Bars Text: Always Show Status Bars
Checkbox@DISPLAY_TARGET_LINES_CHECKBOX:
X: 310
Y: 245
Width: 200
Height: 20
Font: Regular
Text: Display Target Lines
Label@LOCALIZATION_TITLE: Label@LOCALIZATION_TITLE:
Y: 265 Y: 265
Width: PARENT_RIGHT Width: PARENT_RIGHT

7
mods/ra/chrome/settings.yaml
View File

@@ -203,6 +203,13 @@ Background@SETTINGS_PANEL:
Height: 20 Height: 20
Font: Regular Font: Regular
Text: Always Show Status Bars Text: Always Show Status Bars
Checkbox@DISPLAY_TARGET_LINES_CHECKBOX:
X: 310
Y: 265
Width: 200
Height: 20
Font: Regular
Text: Display Target Lines
Label@LOCALIZATION_TITLE: Label@LOCALIZATION_TITLE:
Y: 270 Y: 270
Width: PARENT_RIGHT Width: PARENT_RIGHT