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

fixed #1244 - cnc lobby crash on player joining

Browse Source
This commit is contained in:
Chris Forbes
2011-10-30 09:09:24 +13:00
parent 5bb535b50c
commit 2a64df997a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
View File

@@ -379,9 +379,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
else // Bot else // Bot
template.GetWidget<ImageWidget>("STATUS_IMAGE").IsVisible = () => true; template.GetWidget<ImageWidget>("STATUS_IMAGE").IsVisible = () => true;
} }
// Non-editable player in slot
else else
{ { // Non-editable player in slot
template = NonEditablePlayerTemplate.Clone(); template = NonEditablePlayerTemplate.Clone();
template.GetWidget<LabelWidget>("NAME").GetText = () => client.Name; template.GetWidget<LabelWidget>("NAME").GetText = () => client.Name;
var color = template.GetWidget<ColorBlockWidget>("COLOR"); var color = template.GetWidget<ColorBlockWidget>("COLOR");
@@ -397,9 +396,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var team = template.GetWidget<LabelWidget>("TEAM"); var team = template.GetWidget<LabelWidget>("TEAM");
team.GetText = () => (client.Team == 0) ? "-" : client.Team.ToString(); team.GetText = () => (client.Team == 0) ? "-" : client.Team.ToString();
var spawn = template.GetWidget<LabelWidget>("SPAWN");
spawn.GetText = () => (client.SpawnPoint == 0) ? "-" : client.SpawnPoint.ToString();
template.GetWidget<ImageWidget>("STATUS_IMAGE").IsVisible = () => template.GetWidget<ImageWidget>("STATUS_IMAGE").IsVisible = () =>
client.Bot != null || client.State == Session.ClientState.Ready; client.Bot != null || client.State == Session.ClientState.Ready;