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

Code cleanup

Browse Source
This commit is contained in:
Matthias Mailänder
2022-05-28 16:09:52 +02:00
committed by teinarss
parent 10ac07bf9f
commit 2c8c6e50da
20 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Support/Log.cs
View File

@@ -171,6 +171,11 @@ namespace OpenRA
ChannelWriter.TryWrite(new ChannelData(channelName, value)); ChannelWriter.TryWrite(new ChannelData(channelName, value));
} }
public static void Write(string channelName, Exception e)
{
ChannelWriter.TryWrite(new ChannelData(channelName, $"{e.Message}{Environment.NewLine}{e.StackTrace}"));
}
public static void Write(string channelName, string format, params object[] args) public static void Write(string channelName, string format, params object[] args)
{ {
ChannelWriter.TryWrite(new ChannelData(channelName, format.F(args))); ChannelWriter.TryWrite(new ChannelData(channelName, format.F(args)));

2
OpenRA.Mods.Common/Traits/World/TimeLimitManager.cs
View File

@@ -160,7 +160,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
TextNotificationsManager.AddSystemLine(Notification.F(m, m > 1 ? "s" : null)); TextNotificationsManager.AddSystemLine(Notification.F(m, m > 1 ? "s" : null));
var faction = self.World.LocalPlayer == null ? null : self.World.LocalPlayer.Faction.InternalName; var faction = self.World.LocalPlayer?.Faction.InternalName;
Game.Sound.PlayNotification(self.World.Map.Rules, self.World.LocalPlayer, "Speech", info.TimeLimitWarnings[m], faction); Game.Sound.PlayNotification(self.World.Map.Rules, self.World.LocalPlayer, "Speech", info.TimeLimitWarnings[m], faction);
} }
} }

9
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var spriteWidget = panel.GetOrNull<SpriteWidget>("SPRITE"); var spriteWidget = panel.GetOrNull<SpriteWidget>("SPRITE");
if (spriteWidget != null) if (spriteWidget != null)
{ {
spriteWidget.GetSprite = () => currentSprites != null ? currentSprites[currentFrame] : null; spriteWidget.GetSprite = () => currentSprites?[currentFrame];
currentPalette = spriteWidget.Palette; currentPalette = spriteWidget.Palette;
spriteScale = spriteWidget.Scale; spriteScale = spriteWidget.Scale;
spriteWidget.GetPalette = () => currentPalette; spriteWidget.GetPalette = () => currentPalette;
@@ -394,7 +394,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (string.IsNullOrWhiteSpace(filter)) if (string.IsNullOrWhiteSpace(filter))
return true; return true;
if (filename.IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0) if (filename.Contains(filter, StringComparison.OrdinalIgnoreCase))
return true; return true;
return false; return false;
@@ -524,11 +524,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
else else
return false; return false;
} }
catch (Exception ex) catch (Exception exception)
{ {
isLoadError = true; isLoadError = true;
Log.AddChannel("assetbrowser", "assetbrowser.log"); Log.AddChannel("assetbrowser", "assetbrowser.log");
Log.Write("assetbrowser", "Error reading {0}:{3} {1}{3}{2}", filename, ex.Message, ex.StackTrace, Environment.NewLine); Log.Write("assetbrowser", $"Error reading {filename}");
Log.Write("assetbrowser", exception);
return false; return false;
} }

2
OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
View File

@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
} }
IEnumerable<string> ParseLines(Stream file) static IEnumerable<string> ParseLines(Stream file)
{ {
return file.ReadAllLines().Select(l => l.Replace("\t", " ").Replace("*", "\u2022")).ToList(); return file.ReadAllLines().Select(l => l.Replace("\t", " ").Replace("*", "\u2022")).ToList();
} }

6
OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
View File

@@ -190,15 +190,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
map.Save(package); map.Save(package);
Console.WriteLine("Saved current map at {0}", combinedPath); Console.WriteLine($"Saved current map at {combinedPath}");
Ui.CloseWindow(); Ui.CloseWindow();
onSave(map.Uid); onSave(map.Uid);
} }
catch (Exception e) catch (Exception e)
{ {
Log.Write("debug", "Failed to save map at {0}: {1}", combinedPath, e.Message); Log.Write("debug", $"Failed to save map at {combinedPath}");
Log.Write("debug", "{0}", e.StackTrace); Log.Write("debug", e);
ConfirmationDialogs.ButtonPrompt( ConfirmationDialogs.ButtonPrompt(
title: "Failed to save map", title: "Failed to save map",

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
View File

@@ -153,7 +153,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
} }
public void Order(World world, string order) public static void Order(World world, string order)
{ {
world.IssueOrder(new Order(order, world.LocalPlayer.PlayerActor, false)); world.IssueOrder(new Order(order, world.LocalPlayer.PlayerActor, false));
} }

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
View File

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
mo.ObjectiveAdded += redrawObjectives; mo.ObjectiveAdded += redrawObjectives;
} }
void PopulateObjectivesList(MissionObjectives mo, ScrollPanelWidget parent, ContainerWidget template) static void PopulateObjectivesList(MissionObjectives mo, ScrollPanelWidget parent, ContainerWidget template)
{ {
parent.RemoveChildren(); parent.RemoveChildren();

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -469,7 +469,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return template; return template;
} }
void SetupPlayerColor(Player player, ScrollItemWidget template, ColorBlockWidget colorBlockWidget, GradientColorBlockWidget gradientColorBlockWidget) static void SetupPlayerColor(Player player, ScrollItemWidget template, ColorBlockWidget colorBlockWidget, GradientColorBlockWidget gradientColorBlockWidget)
{ {
var color = Color.FromArgb(128, player.Color.R, player.Color.G, player.Color.B); var color = Color.FromArgb(128, player.Color.R, player.Color.G, player.Color.B);
var hoverColor = Color.FromArgb(192, player.Color.R, player.Color.G, player.Color.B); var hoverColor = Color.FromArgb(192, player.Color.R, player.Color.G, player.Color.B);

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var requiresFormat = requiresLabel.Text; var requiresFormat = requiresLabel.Text;
ActorInfo lastActor = null; ActorInfo lastActor = null;
Hotkey lastHotkey = Hotkey.Invalid; var lastHotkey = Hotkey.Invalid;
var lastPowerState = pm?.PowerState ?? PowerState.Normal; var lastPowerState = pm?.PowerState ?? PowerState.Normal;
var descLabelY = descLabel.Bounds.Y; var descLabelY = descLabel.Bounds.Y;
var descLabelPadding = descLabel.Bounds.Height; var descLabelPadding = descLabel.Bounds.Height;

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var timeOffset = timeLabel.Bounds.X; var timeOffset = timeLabel.Bounds.X;
SupportPowerInstance lastPower = null; SupportPowerInstance lastPower = null;
Hotkey lastHotkey = Hotkey.Invalid; var lastHotkey = Hotkey.Invalid;
var lastRemainingSeconds = 0; var lastRemainingSeconds = 0;
tooltipContainer.BeforeRender = () => tooltipContainer.BeforeRender = () =>

8
OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromDiscLogic.cs
View File

@@ -137,7 +137,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var path = FindSourcePath(kv.Value, volumes); var path = FindSourcePath(kv.Value, volumes);
if (path != null) if (path != null)
{ {
Log.Write("install", "Using installer `{0}: {1}` of type `{2}`:", kv.Key, kv.Value.Title, kv.Value.Type); Log.Write("install", $"Using installer `{kv.Key}: {kv.Value.Title}` of type `{kv.Value.Type}`:");
var packages = content.Packages.Values var packages = content.Packages.Values
.Where(p => p.Sources.Contains(kv.Key) && !p.IsInstalled()) .Where(p => p.Sources.Contains(kv.Key) && !p.IsInstalled())
@@ -271,13 +271,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Yaml path may be specified relative to a named directory (e.g. ^SupportDir) or the detected disc path // Yaml path may be specified relative to a named directory (e.g. ^SupportDir) or the detected disc path
var sourcePath = i.Value.Value.StartsWith("^") ? Platform.ResolvePath(i.Value.Value) : Path.Combine(path, i.Value.Value); var sourcePath = i.Value.Value.StartsWith("^") ? Platform.ResolvePath(i.Value.Value) : Path.Combine(path, i.Value.Value);
Log.Write("debug", "Deleting {0}", sourcePath); Log.Write("debug", $"Deleting {sourcePath}");
File.Delete(sourcePath); File.Delete(sourcePath);
break; break;
} }
default: default:
Log.Write("debug", "Unknown installation command {0} - ignoring", i.Key); Log.Write("debug", $"Unknown installation command {i.Key} - ignoring");
break; break;
} }
} }
@@ -499,7 +499,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return null; return null;
} }
bool IsValidSourcePath(string path, ModContent.ModSource source) static bool IsValidSourcePath(string path, ModContent.ModSource source)
{ {
try try
{ {

4
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -212,7 +212,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
slotsButton.IsVisible = () => panel != PanelType.Servers; slotsButton.IsVisible = () => panel != PanelType.Servers;
slotsButton.IsDisabled = () => configurationDisabled() || panel != PanelType.Players || slotsButton.IsDisabled = () => configurationDisabled() || panel != PanelType.Players ||
(orderManager.LobbyInfo.Slots.Values.All(s => !s.AllowBots) && (orderManager.LobbyInfo.Slots.Values.All(s => !s.AllowBots) &&
orderManager.LobbyInfo.Slots.Count(s => !s.Value.LockTeam && orderManager.LobbyInfo.ClientInSlot(s.Key) != null) == 0); !orderManager.LobbyInfo.Slots.Any(s => !s.Value.LockTeam && orderManager.LobbyInfo.ClientInSlot(s.Key) != null));
slotsButton.OnMouseDown = _ => slotsButton.OnMouseDown = _ =>
{ {
@@ -269,7 +269,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
Title = $"{d} Teams", Title = $"{d} Teams",
IsSelected = () => false, IsSelected = () => false,
OnClick = () => orderManager.IssueOrder(Order.Command($"assignteams {d.ToString()}")) OnClick = () => orderManager.IssueOrder(Order.Command($"assignteams {d}"))
}).ToList(); }).ToList();
if (orderManager.LobbyInfo.Slots.Any(s => s.Value.AllowBots)) if (orderManager.LobbyInfo.Slots.Any(s => s.Value.AllowBots))

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
"Slot", new List<SlotDropDownOption> "Slot", new List<SlotDropDownOption>
{ {
new SlotDropDownOption("Open", "slot_open " + slot.PlayerReference, () => (!slot.Closed && client == null)), new SlotDropDownOption("Open", "slot_open " + slot.PlayerReference, () => !slot.Closed && client == null),
new SlotDropDownOption("Closed", "slot_close " + slot.PlayerReference, () => slot.Closed) new SlotDropDownOption("Closed", "slot_close " + slot.PlayerReference, () => slot.Closed)
} }
} }

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public SpawnSelectorTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, MapPreviewWidget preview, bool showUnoccupiedSpawnpoints) public SpawnSelectorTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, MapPreviewWidget preview, bool showUnoccupiedSpawnpoints)
{ {
bool showTooltip = true; var showTooltip = true;
widget.IsVisible = () => preview.TooltipSpawnIndex != -1 && showTooltip; widget.IsVisible = () => preview.TooltipSpawnIndex != -1 && showTooltip;
var label = widget.Get<LabelWidget>("LABEL"); var label = widget.Get<LabelWidget>("LABEL");
var flag = widget.Get<ImageWidget>("FLAG"); var flag = widget.Get<ImageWidget>("FLAG");

2
OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs
View File

@@ -346,7 +346,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}); });
} }
void LoadMapIntoEditor(string uid) static void LoadMapIntoEditor(string uid)
{ {
Game.LoadEditor(uid); Game.LoadEditor(uid);

5
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
SetupMapTab(MapClassification.User, filter, "USER_MAPS_TAB_BUTTON", "USER_MAPS_TAB", itemTemplate); SetupMapTab(MapClassification.User, filter, "USER_MAPS_TAB_BUTTON", "USER_MAPS_TAB", itemTemplate);
SetupMapTab(MapClassification.System, filter, "SYSTEM_MAPS_TAB_BUTTON", "SYSTEM_MAPS_TAB", itemTemplate); SetupMapTab(MapClassification.System, filter, "SYSTEM_MAPS_TAB_BUTTON", "SYSTEM_MAPS_TAB", itemTemplate);
if (initialMap == null && tabMaps.Keys.Contains(initialTab) && tabMaps[initialTab].Length > 0) if (initialMap == null && tabMaps.ContainsKey(initialTab) && tabMaps[initialTab].Length > 0)
{ {
selectedUid = Game.ModData.MapCache.ChooseInitialMap(tabMaps[initialTab].Select(mp => mp.Uid).First(), selectedUid = Game.ModData.MapCache.ChooseInitialMap(tabMaps[initialTab].Select(mp => mp.Uid).First(),
Game.CosmeticRandom); Game.CosmeticRandom);
@@ -178,8 +178,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
foreach (var category in map.Categories) foreach (var category in map.Categories)
{ {
var count = 0; categoryDict.TryGetValue(category, out var count);
categoryDict.TryGetValue(category, out count);
categoryDict[category] = count + 1; categoryDict[category] = count + 1;
} }
} }

9
OpenRA.Mods.Common/Widgets/Logic/PlayerProfileLogic.cs
View File

@@ -211,9 +211,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
var badges = Ui.LoadWidget("PLAYER_PROFILE_BADGES_INSERT", badgeContainer, new WidgetArgs() var badges = Ui.LoadWidget("PLAYER_PROFILE_BADGES_INSERT", badgeContainer, new WidgetArgs()
{ {
{ "worldRenderer", worldRenderer }, { nameof(worldRenderer), worldRenderer },
{ "profile", profile }, { nameof(profile), profile },
{ "negotiateWidth", negotiateWidth } { nameof(negotiateWidth), negotiateWidth }
}); });
if (badges.Bounds.Height > 0) if (badges.Bounds.Height > 0)
@@ -236,7 +236,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
catch (Exception e) catch (Exception e)
{ {
Log.Write("debug", "Failed to parse player data result with exception: {0}", e); Log.Write("debug", "Failed to parse player data result with exception");
Log.Write("debug", e);
} }
finally finally
{ {

7
OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
View File

@@ -445,7 +445,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}; };
var deleteAllButton = panel.Get<ButtonWidget>("MNG_DELALL_BUTTON"); var deleteAllButton = panel.Get<ButtonWidget>("MNG_DELALL_BUTTON");
deleteAllButton.IsDisabled = () => replayState.Count(kvp => kvp.Value.Visible) == 0; deleteAllButton.IsDisabled = () => !replayState.Any(kvp => kvp.Value.Visible);
deleteAllButton.OnClick = () => deleteAllButton.OnClick = () =>
{ {
var list = replayState.Where(kvp => kvp.Value.Visible).Select(kvp => kvp.Key).ToList(); var list = replayState.Where(kvp => kvp.Value.Visible).Select(kvp => kvp.Key).ToList();
@@ -511,7 +511,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
replayState.Remove(replay); replayState.Remove(replay);
} }
bool EvaluateReplayVisibility(ReplayMetadata replay) static bool EvaluateReplayVisibility(ReplayMetadata replay)
{ {
// Game type // Game type
if ((filter.Type == GameType.Multiplayer && replay.GameInfo.IsSinglePlayer) || (filter.Type == GameType.Singleplayer && !replay.GameInfo.IsSinglePlayer)) if ((filter.Type == GameType.Multiplayer && replay.GameInfo.IsSinglePlayer) || (filter.Type == GameType.Singleplayer && !replay.GameInfo.IsSinglePlayer))
@@ -675,7 +675,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
catch (Exception e) catch (Exception e)
{ {
Log.Write("debug", "Exception while parsing replay: {0}", e); Log.Write("debug", $"Exception while parsing replay: {replay}");
Log.Write("debug", e);
SelectReplay(null); SelectReplay(null);
} }
} }

2
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

@@ -320,7 +320,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
RefreshServerList(); RefreshServerList();
} }
string PlayersLabel(GameServer game) static string PlayersLabel(GameServer game)
{ {
return $"{(game.Players > 0 ? game.Players.ToString() : "No")} Player{(game.Players != 1 ? "s" : "")}{(game.Bots > 0 ? $", {game.Bots} Bot{(game.Bots != 1 ? "s" : "")}" : "")}{(game.Spectators > 0 ? $", {game.Spectators} Spectator{(game.Spectators != 1 ? "s" : "")}" : "")}"; return $"{(game.Players > 0 ? game.Players.ToString() : "No")} Player{(game.Players != 1 ? "s" : "")}{(game.Bots > 0 ? $", {game.Bots} Bot{(game.Bots != 1 ? "s" : "")}" : "")}{(game.Spectators > 0 ? $", {game.Spectators} Spectator{(game.Spectators != 1 ? "s" : "")}" : "")}";
} }

2
OpenRA.Mods.Common/Widgets/Logic/Settings/InputSettingsLogic.cs
View File

@@ -184,7 +184,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys, setupItem); dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys, setupItem);
} }
void MakeMouseFocusSettingsLive() static void MakeMouseFocusSettingsLive()
{ {
var gameSettings = Game.Settings.Game; var gameSettings = Game.Settings.Game;