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

Remove PPos hacks from RadarWidget.

Browse Source
This commit is contained in:
Paul Chote
2013-09-20 21:56:40 +12:00
parent ad44610e5a
commit b335d67ce3
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.RA/Widgets/RadarWidget.cs
View File

@@ -42,11 +42,13 @@ namespace OpenRA.Mods.RA.Widgets
Sprite shroudSprite;
readonly World world;
readonly WorldRenderer worldRenderer;
[ObjectCreator.UseCtor]
public RadarWidget(World world)
public RadarWidget(World world, WorldRenderer worldRenderer)
{
this.world = world;
this.worldRenderer = worldRenderer;
}
public override void Initialize(WidgetArgs args)
@@ -104,19 +106,21 @@ namespace OpenRA.Mods.RA.Widgets
if (!hasRadar)
return true;
var loc = MinimapPixelToCell(mi.Location);
var cell = MinimapPixelToCell(mi.Location);
var pos = cell.CenterPosition;
if ((mi.Event == MouseInputEvent.Down || mi.Event == MouseInputEvent.Move) && mi.Button == MouseButton.Left)
Game.viewport.Center(loc.ToFloat2());
Game.viewport.Center(cell.ToFloat2());
if (mi.Event == MouseInputEvent.Down && mi.Button == MouseButton.Right)
{
// fake a mousedown/mouseup here
var location = Game.viewport.WorldToViewPx(worldRenderer.ScreenPxPosition(pos));
var fakemi = new MouseInput
{
Event = MouseInputEvent.Down,
Button = MouseButton.Right,
Modifiers = mi.Modifiers,
Location = (loc.ToPPos().ToFloat2() - Game.viewport.Location).ToInt2()
Location = location
};
if (WorldInteractionController != null)