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

Don't crash when a faction flag from another mod doesn't exist.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-05-08 16:02:23 +02:00
parent bd2a24af55
commit 3b7a176aa6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets.Logic namespace OpenRA.Mods.Common.Widgets.Logic
@@ -32,6 +33,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly List<ReplayMetadata> replays = new List<ReplayMetadata>(); readonly List<ReplayMetadata> replays = new List<ReplayMetadata>();
readonly Dictionary<ReplayMetadata, ReplayState> replayState = new Dictionary<ReplayMetadata, ReplayState>(); readonly Dictionary<ReplayMetadata, ReplayState> replayState = new Dictionary<ReplayMetadata, ReplayState>();
readonly Action onStart; readonly Action onStart;
readonly ModData modData;
Dictionary<CPos, SpawnOccupant> selectedSpawns; Dictionary<CPos, SpawnOccupant> selectedSpawns;
ReplayMetadata selectedReplay; ReplayMetadata selectedReplay;
@@ -43,6 +45,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
panel = widget; panel = widget;
this.modData = modData;
this.onStart = onStart; this.onStart = onStart;
playerList = panel.Get<ScrollPanelWidget>("PLAYER_LIST"); playerList = panel.Get<ScrollPanelWidget>("PLAYER_LIST");
@@ -649,7 +652,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var flag = item.Get<ImageWidget>("FLAG"); var flag = item.Get<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags"; flag.GetImageCollection = () => "flags";
flag.GetImageName = () => o.FactionId; var factionInfo = modData.DefaultRules.Actors["world"].TraitInfos<FactionInfo>();
flag.GetImageName = () => (factionInfo != null && factionInfo.Any(f => f.InternalName == o.FactionId)) ? o.FactionId : "Random";
playerList.AddChild(item); playerList.AddChild(item);
} }