Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix player score not updating while game info screen is visible #15915

Merged
merged 2 commits into from Dec 23, 2018
Merged

Fix player score not updating while game info screen is visible #15915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa41dbb
Fix player score not updating while game info screen is visible
obrakmann Nov 11, 2018
a17345c
Cache some more strings in GameInfoStatsLogic
obrakmann Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View file
Open in desktop
Expand Up @@ -77,7 +77,9 @@ public GameInfoStatsLogic(Widget widget, World world, OrderManager orderManager,
var teamHeader = ScrollItemWidget.Setup(teamTemplate, () => true, () => { });
teamHeader.Get<LabelWidget>("TEAM").GetText = () => t.Key == 0 ? "No Team" : "Team {0}".F(t.Key);
var teamRating = teamHeader.Get<LabelWidget>("TEAM_SCORE");
teamRating.GetText = () => t.Sum(gg => gg.Second != null ? gg.Second.Experience : 0).ToString();
var scoreCache = new CachedTransform<int, string>(s => s.ToString());
var teamMemberScores = t.Select(tt => tt.Second).Where(s => s != null).ToArray().Select(s => s.Experience);
teamRating.GetText = () => scoreCache.Update(teamMemberScores.Sum());

playerPanel.AddChild(teamHeader);
}
Expand All @@ -93,17 +95,16 @@ public GameInfoStatsLogic(Widget widget, World world, OrderManager orderManager,
var nameFont = Game.Renderer.Fonts[nameLabel.Font];

var suffixLength = new CachedTransform<string, int>(s => nameFont.Measure(s).X);
var name = new CachedTransform<Pair<string, int>, string>(c =>
WidgetUtils.TruncateText(c.First, nameLabel.Bounds.Width - c.Second, nameFont));
var name = new CachedTransform<Pair<string, string>, string>(c =>
WidgetUtils.TruncateText(c.First, nameLabel.Bounds.Width - suffixLength.Update(c.Second), nameFont) + c.Second);

nameLabel.GetText = () =>
{
var suffix = pp.WinState == WinState.Undefined ? "" : " (" + pp.WinState + ")";
if (client != null && client.State == Session.ClientState.Disconnected)
suffix = " (Gone)";

var sl = suffixLength.Update(suffix);
return name.Update(Pair.New(pp.PlayerName, sl)) + suffix;
return name.Update(Pair.New(pp.PlayerName, suffix));
};
nameLabel.GetColor = () => pp.Color.RGB;

Expand All @@ -120,8 +121,8 @@ public GameInfoStatsLogic(Widget widget, World world, OrderManager orderManager,
item.Get<LabelWidget>("FACTION").GetText = () => pp.DisplayFaction.Name;
}

var experience = p.Second != null ? p.Second.Experience : 0;
item.Get<LabelWidget>("SCORE").GetText = () => experience.ToString();
var scoreCache = new CachedTransform<int, string>(s => s.ToString());
item.Get<LabelWidget>("SCORE").GetText = () => scoreCache.Update(p.Second != null ? p.Second.Experience : 0);

playerPanel.AddChild(item);
}
Expand All @@ -144,14 +145,13 @@ public GameInfoStatsLogic(Widget widget, World world, OrderManager orderManager,
var nameFont = Game.Renderer.Fonts[nameLabel.Font];

var suffixLength = new CachedTransform<string, int>(s => nameFont.Measure(s).X);
var name = new CachedTransform<Pair<string, int>, string>(c =>
WidgetUtils.TruncateText(c.First, nameLabel.Bounds.Width - c.Second, nameFont));
var name = new CachedTransform<Pair<string, string>, string>(c =>
WidgetUtils.TruncateText(c.First, nameLabel.Bounds.Width - suffixLength.Update(c.Second), nameFont) + c.Second);

nameLabel.GetText = () =>
{
var suffix = client.State == Session.ClientState.Disconnected ? " (Gone)" : "";
var sl = suffixLength.Update(suffix);
return name.Update(Pair.New(client.Name, sl)) + suffix;
return name.Update(Pair.New(client.Name, suffix));
};

item.Get<ImageWidget>("FACTIONFLAG").IsVisible = () => false;
Expand Down