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

Fix lobby crash if a map's DefaultCash isn't Selectable.

Browse Source
This commit is contained in:
Paul Chote
2025-12-28 17:26:53 +00:00
committed by Gustas Kažukauskas
parent fdb4ce4e0f
commit 2246922118
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Tooltip description for the starting cash option in the lobby.")]
public readonly string DefaultCashDropdownDescription = "The amount of cash that players start with";
[Desc("Starting cash options that are available in the lobby options.")]
[Desc("Starting cash options that are available in the lobby options. DefaultCash will be included if not specified.")]
public readonly ImmutableArray<int> SelectableCash = [2500, 5000, 10000, 20000];
[Desc("Default starting cash option: should be one of the SelectableCash options.")]
@@ -65,7 +65,9 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(MapPreview map)
{
var startingCash = SelectableCash.ToDictionary(c => c.ToStringInvariant(), c => "$" + c.ToString(NumberFormatInfo.CurrentInfo));
// Make sure that DefaultCash is included in the available options
var startingCash = SelectableCash.Append(DefaultCash).ToHashSet()
.ToDictionary(c => c.ToStringInvariant(), c => "$" + c.ToString(NumberFormatInfo.CurrentInfo));
if (startingCash.Count > 0)
yield return new LobbyOption(map, "startingcash",