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

Fix a few tooltip translations being called every frame

Browse Source 
in WorldTooltipLogic and IngamePowerBarLogic
This commit is contained in:
Gustas
2022-09-07 20:50:46 +03:00
committed by abcdefg30
parent 56a9acd035
commit 1b00cef30f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
View File

@@ -26,11 +26,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var powerManager = world.LocalPlayer.PlayerActor.Trait<PowerManager>(); var powerManager = world.LocalPlayer.PlayerActor.Trait<PowerManager>();
var power = widget.Get<LabelWithTooltipWidget>("POWER"); var power = widget.Get<LabelWithTooltipWidget>("POWER");
var powerIcon = widget.Get<ImageWidget>("POWER_ICON"); var powerIcon = widget.Get<ImageWidget>("POWER_ICON");
var powerUsage = modData.Translation.GetString(PowerUsage);
powerIcon.GetImageName = () => powerManager.ExcessPower < 0 ? "power-critical" : "power-normal"; powerIcon.GetImageName = () => powerManager.ExcessPower < 0 ? "power-critical" : "power-normal";
power.GetColor = () => powerManager.ExcessPower < 0 ? Color.Red : Color.White; power.GetColor = () => powerManager.ExcessPower < 0 ? Color.Red : Color.White;
power.GetText = () => powerManager.PowerProvided == 1000000 ? "∞" : powerManager.ExcessPower.ToString(); power.GetText = () => powerManager.PowerProvided == 1000000 ? "∞" : powerManager.ExcessPower.ToString();
power.GetTooltipText = () => modData.Translation.GetString(PowerUsage) + ": " + powerManager.PowerDrained.ToString() + power.GetTooltipText = () => powerUsage + ": " + powerManager.PowerDrained.ToString() +
(powerManager.PowerProvided != 1000000 ? "/" + powerManager.PowerProvided.ToString() : ""); (powerManager.PowerProvided != 1000000 ? "/" + powerManager.PowerProvided.ToString() : "");
} }
} }

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs
View File

@@ -44,6 +44,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var extraHeightOnDouble = extras.Bounds.Y; var extraHeightOnDouble = extras.Bounds.Y;
var extraHeightOnSingle = extraHeightOnDouble - (doubleHeight - singleHeight); var extraHeightOnSingle = extraHeightOnDouble - (doubleHeight - singleHeight);
var unrevealedTerrain = modData.Translation.GetString(UnrevealedTerrain);
tooltipContainer.BeforeRender = () => tooltipContainer.BeforeRender = () =>
{ {
if (viewport == null || viewport.TooltipType == WorldTooltipType.None) if (viewport == null || viewport.TooltipType == WorldTooltipType.None)
@@ -57,7 +59,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
switch (viewport.TooltipType) switch (viewport.TooltipType)
{ {
case WorldTooltipType.Unexplored: case WorldTooltipType.Unexplored:
labelText = modData.Translation.GetString(UnrevealedTerrain); labelText = unrevealedTerrain;
break; break;
case WorldTooltipType.Resource: case WorldTooltipType.Resource:
labelText = viewport.ResourceTooltip; labelText = viewport.ResourceTooltip;