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

fixes #2785 don't crash when last player leaves game in cnc

Browse Source
This commit is contained in:
Matthias Mailänder
2013-03-20 12:44:47 +01:00
parent e9602ca4e9
commit 57d85e2c97
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Cnc/Widgets/Logic/CncConquestObjectivesLogic.cs
View File

@@ -46,7 +46,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
foreach (var p in world.Players.Where(a => !a.NonCombatant)) foreach (var p in world.Players.Where(a => !a.NonCombatant))
{ {
Player pp = p; Player pp = p;
var c = world.LobbyInfo.ClientWithIndex(pp.ClientIndex);
var item = itemTemplate.Clone(); var item = itemTemplate.Clone();
var nameLabel = item.Get<LabelWidget>("NAME"); var nameLabel = item.Get<LabelWidget>("NAME");
nameLabel.GetText = () => pp.WinState == WinState.Lost ? pp.PlayerName + " (Dead)" : pp.PlayerName; nameLabel.GetText = () => pp.WinState == WinState.Lost ? pp.PlayerName + " (Dead)" : pp.PlayerName;
@@ -58,7 +57,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
item.Get<LabelWidget>("FACTION").GetText = () => pp.Country.Name; item.Get<LabelWidget>("FACTION").GetText = () => pp.Country.Name;
var team = item.Get<LabelWidget>("TEAM"); var team = item.Get<LabelWidget>("TEAM");
team.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString(); team.GetText = () => (pp.PlayerReference.Team == 0) ? "-" : pp.PlayerReference.Team.ToString();
scrollpanel.AddChild(item); scrollpanel.AddChild(item);
item.Get<LabelWidget>("KILLS").GetText = () => pp.Kills.ToString(); item.Get<LabelWidget>("KILLS").GetText = () => pp.Kills.ToString();