Bye Bye Chrome!

This commit is contained in:
alzeih
2010-07-21 17:57:06 +12:00
parent 0ac91d3c5e
commit 222b29cec6
35 changed files with 180 additions and 199 deletions

View File

@@ -24,10 +24,10 @@ namespace OpenRA.Widgets
public override void DrawInner(World world)
{
if (Widget.ticksSinceLastMove < worldTooltipDelay || world == null || world.LocalPlayer == null)
if (Widget.TicksSinceLastMove < worldTooltipDelay || world == null || world.LocalPlayer == null)
return;
var actor = world.FindUnitsAtMouse(Widget.lastMousePos).FirstOrDefault();
var actor = world.FindUnitsAtMouse(Widget.LastMousePos).FirstOrDefault();
if (actor == null) return;
var text = actor.Info.Traits.Contains<ValuedInfo>()
@@ -37,7 +37,7 @@ namespace OpenRA.Widgets
? "" : "{0}".F(actor.Owner.PlayerName);
var text3 = (actor.Owner == world.LocalPlayer || actor.Owner.NonCombatant)
? "" : " ({0})".F(world.LocalPlayer.Stances[actor.Owner]);
var renderer = Game.chrome.renderer;
var renderer = Game.Renderer;
var sz = renderer.BoldFont.Measure(text);
var sz2 = renderer.RegularFont.Measure(text2);
@@ -51,23 +51,23 @@ namespace OpenRA.Widgets
sz.Y += 24;
WidgetUtils.DrawPanel("dialog4", Rectangle.FromLTRB(
Widget.lastMousePos.X + 20, Widget.lastMousePos.Y + 20,
Widget.lastMousePos.X + sz.X + 20, Widget.lastMousePos.Y + sz.Y + 20));
Widget.LastMousePos.X + 20, Widget.LastMousePos.Y + 20,
Widget.LastMousePos.X + sz.X + 20, Widget.LastMousePos.Y + sz.Y + 20));
renderer.BoldFont.DrawText(text,
new float2(Widget.lastMousePos.X + 30, Widget.lastMousePos.Y + 30), Color.White);
new float2(Widget.LastMousePos.X + 30, Widget.LastMousePos.Y + 30), Color.White);
if (text2 != "")
{
renderer.RegularFont.DrawText(text2,
new float2(Widget.lastMousePos.X + 65, Widget.lastMousePos.Y + 50), actor.Owner.Color);
new float2(Widget.LastMousePos.X + 65, Widget.LastMousePos.Y + 50), actor.Owner.Color);
renderer.RegularFont.DrawText(text3,
new float2(Widget.lastMousePos.X + 65 + sz2.X, Widget.lastMousePos.Y + 50), Color.White);
new float2(Widget.LastMousePos.X + 65 + sz2.X, Widget.LastMousePos.Y + 50), Color.White);
WidgetUtils.DrawRGBA(
ChromeProvider.GetImage(Game.chrome.renderer, "flags", actor.Owner.Country.Race),
new float2(Widget.lastMousePos.X + 30, Widget.lastMousePos.Y + 50));
ChromeProvider.GetImage(Game.Renderer, "flags", actor.Owner.Country.Race),
new float2(Widget.LastMousePos.X + 30, Widget.LastMousePos.Y + 50));
}
renderer.RgbaSpriteRenderer.Flush();