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

Order help commands by name.

Browse Source
This commit is contained in:
RoosterDragon
2024-07-20 19:16:46 +01:00
committed by Gustas
parent c1f99cb094
commit 84f8c6a4c6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Commands/ChatCommands.cs
View File

@@ -10,7 +10,6 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
@@ -37,10 +36,9 @@ namespace OpenRA.Mods.Common.Commands
if (message.StartsWith('/')) if (message.StartsWith('/'))
{ {
var name = message[1..].Split(' ')[0].ToLowerInvariant(); var name = message[1..].Split(' ')[0].ToLowerInvariant();
var command = Commands.FirstOrDefault(x => x.Key == name);
if (command.Value != null) if (Commands.TryGetValue(name, out var command))
command.Value.InvokeCommand(name.ToLowerInvariant(), message[(1 + name.Length)..].Trim()); command.InvokeCommand(name, message[(1 + name.Length)..].Trim());
else else
TextNotificationsManager.Debug(TranslationProvider.GetString(InvalidCommand, Translation.Arguments("name", name))); TextNotificationsManager.Debug(TranslationProvider.GetString(InvalidCommand, Translation.Arguments("name", name)));

3
OpenRA.Mods.Common/Commands/HelpCommand.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
@@ -53,7 +54,7 @@ namespace OpenRA.Mods.Common.Commands
{ {
TextNotificationsManager.Debug(TranslationProvider.GetString(AvailableCommands)); TextNotificationsManager.Debug(TranslationProvider.GetString(AvailableCommands));
foreach (var key in console.Commands.Keys) foreach (var key in console.Commands.Keys.OrderBy(k => k))
{ {
if (!helpDescriptions.TryGetValue(key, out var description)) if (!helpDescriptions.TryGetValue(key, out var description))
description = TranslationProvider.GetString(NoDescription); description = TranslationProvider.GetString(NoDescription);