Kill crufty makefile warnings
This commit is contained in:
@@ -117,7 +117,6 @@ namespace OpenRA.FileFormats
|
|||||||
public void Save(string filepath)
|
public void Save(string filepath)
|
||||||
{
|
{
|
||||||
Dictionary<string, MiniYaml> root = new Dictionary<string, MiniYaml>();
|
Dictionary<string, MiniYaml> root = new Dictionary<string, MiniYaml>();
|
||||||
var d = new Dictionary<string, MiniYaml>();
|
|
||||||
foreach (var field in SimpleFields)
|
foreach (var field in SimpleFields)
|
||||||
{
|
{
|
||||||
FieldInfo f = this.GetType().GetField(field);
|
FieldInfo f = this.GetType().GetField(field);
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ namespace OpenRA.FileFormats
|
|||||||
|
|
||||||
public static MiniYaml FromList<T>(List<T>list)
|
public static MiniYaml FromList<T>(List<T>list)
|
||||||
{
|
{
|
||||||
var d = new Dictionary<string, MiniYaml>();
|
|
||||||
return new MiniYaml( null, list.ToDictionary( x=>x.ToString(), x=>new MiniYaml(null)));
|
return new MiniYaml( null, list.ToDictionary( x=>x.ToString(), x=>new MiniYaml(null)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -83,7 +83,6 @@ namespace OpenRA
|
|||||||
// mapchooser
|
// mapchooser
|
||||||
Sheet mapChooserSheet;
|
Sheet mapChooserSheet;
|
||||||
Sprite mapChooserSprite;
|
Sprite mapChooserSprite;
|
||||||
int mapOffset = 0;
|
|
||||||
|
|
||||||
public Chrome(Renderer r, Manifest m)
|
public Chrome(Renderer r, Manifest m)
|
||||||
{
|
{
|
||||||
@@ -260,9 +259,7 @@ namespace OpenRA
|
|||||||
rgbaRenderer.Flush();
|
rgbaRenderer.Flush();
|
||||||
|
|
||||||
var y = r.Top + 50;
|
var y = r.Top + 50;
|
||||||
|
|
||||||
int maxListItems = ((r.Bottom - 60 - y ) / 20);
|
|
||||||
|
|
||||||
// Don't bother showing a subset of the data
|
// Don't bother showing a subset of the data
|
||||||
// This will be fixed properly when we move the map list to widgets
|
// This will be fixed properly when we move the map list to widgets
|
||||||
foreach (var kv in Game.AvailableMaps)
|
foreach (var kv in Game.AvailableMaps)
|
||||||
@@ -814,7 +811,6 @@ namespace OpenRA
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Return an int telling us the y coordinate at the bottom of the palette
|
// Return an int telling us the y coordinate at the bottom of the palette
|
||||||
int DrawBuildPalette( World world, string queueName )
|
int DrawBuildPalette( World world, string queueName )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -78,7 +78,6 @@ namespace OpenRA
|
|||||||
// Mod assemblies assumed to contain a single namespace
|
// Mod assemblies assumed to contain a single namespace
|
||||||
foreach (var a in m.Assemblies)
|
foreach (var a in m.Assemblies)
|
||||||
{
|
{
|
||||||
var failures = new List<string>();
|
|
||||||
var fullpath = Path.GetFullPath(a);
|
var fullpath = Path.GetFullPath(a);
|
||||||
|
|
||||||
var asm = Assembly.LoadFile(fullpath);
|
var asm = Assembly.LoadFile(fullpath);
|
||||||
|
|||||||
@@ -492,8 +492,7 @@ namespace OpenRA.Server
|
|||||||
|
|
||||||
lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
|
lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
|
||||||
|
|
||||||
foreach( var c in conns )
|
DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
|
||||||
DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
|
|
||||||
|
|
||||||
if (conns.Count == 0) OnServerEmpty();
|
if (conns.Count == 0) OnServerEmpty();
|
||||||
else SyncLobbyInfo();
|
else SyncLobbyInfo();
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ namespace OpenRA
|
|||||||
|
|
||||||
bool dirty = true;
|
bool dirty = true;
|
||||||
bool disabled = false;
|
bool disabled = false;
|
||||||
Player owner;
|
|
||||||
Map map;
|
Map map;
|
||||||
|
|
||||||
public Rectangle? bounds { get { return shroud.exploredBounds; } }
|
public Rectangle? bounds { get { return shroud.exploredBounds; } }
|
||||||
@@ -41,7 +40,6 @@ namespace OpenRA
|
|||||||
public ShroudRenderer(Player owner, Map map)
|
public ShroudRenderer(Player owner, Map map)
|
||||||
{
|
{
|
||||||
this.shroud = owner.World.WorldActor.traits.Get<Traits.Shroud>();
|
this.shroud = owner.World.WorldActor.traits.Get<Traits.Shroud>();
|
||||||
this.owner = owner;
|
|
||||||
this.map = map;
|
this.map = map;
|
||||||
|
|
||||||
sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
|
sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ namespace OpenRA.Widgets
|
|||||||
Animation ready;
|
Animation ready;
|
||||||
Animation clock;
|
Animation clock;
|
||||||
readonly List<Pair<Rectangle, Action<MouseInput>>> buttons = new List<Pair<Rectangle,Action<MouseInput>>>();
|
readonly List<Pair<Rectangle, Action<MouseInput>>> buttons = new List<Pair<Rectangle,Action<MouseInput>>>();
|
||||||
string chromeCollection;
|
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
@@ -87,9 +86,6 @@ namespace OpenRA.Widgets
|
|||||||
var numPowers = powers.Count(p => p.IsAvailable);
|
var numPowers = powers.Count(p => p.IsAvailable);
|
||||||
if (numPowers == 0) return;
|
if (numPowers == 0) return;
|
||||||
|
|
||||||
SupportPower tooltipItem = null;
|
|
||||||
int2 tooltipPos = int2.Zero;
|
|
||||||
|
|
||||||
WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(Bounds.X,Bounds.Y));
|
WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(Bounds.X,Bounds.Y));
|
||||||
for (var i = 1; i < numPowers; i++)
|
for (var i = 1; i < numPowers; i++)
|
||||||
WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-middle"), new float2(Bounds.X, Bounds.Y + i * 51));
|
WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-middle"), new float2(Bounds.X, Bounds.Y + i * 51));
|
||||||
@@ -112,9 +108,7 @@ namespace OpenRA.Widgets
|
|||||||
|
|
||||||
if (rect.Contains(Game.chrome.lastMousePos.ToPoint()))
|
if (rect.Contains(Game.chrome.lastMousePos.ToPoint()))
|
||||||
{
|
{
|
||||||
var pos = drawPos.ToInt2();
|
var pos = drawPos.ToInt2();
|
||||||
var tooltipBounds = new Rectangle(pos.X-3,pos.Y-3,350,54);
|
|
||||||
|
|
||||||
var tl = new int2(pos.X-3,pos.Y-3);
|
var tl = new int2(pos.X-3,pos.Y-3);
|
||||||
var m = new int2(pos.X+64+3,pos.Y+48+3);
|
var m = new int2(pos.X+64+3,pos.Y+48+3);
|
||||||
var br = tl + new int2(64+3+20,60);
|
var br = tl + new int2(64+3+20,60);
|
||||||
|
|||||||
@@ -67,8 +67,6 @@ namespace OpenRA.Mods.RA.Activities
|
|||||||
|
|
||||||
public IActivity Tick( Actor self )
|
public IActivity Tick( Actor self )
|
||||||
{
|
{
|
||||||
var mobile = self.traits.Get<Mobile>();
|
|
||||||
|
|
||||||
if( NextActivity != null )
|
if( NextActivity != null )
|
||||||
return NextActivity;
|
return NextActivity;
|
||||||
|
|
||||||
|
|||||||
@@ -32,11 +32,7 @@ namespace OpenRA.Mods.RA
|
|||||||
|
|
||||||
class C4Demolition : IIssueOrder, IResolveOrder
|
class C4Demolition : IIssueOrder, IResolveOrder
|
||||||
{
|
{
|
||||||
Actor self;
|
public C4Demolition(Actor self) {}
|
||||||
public C4Demolition(Actor self)
|
|
||||||
{
|
|
||||||
this.self = self;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
|
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user