smite some more compile warnings (amended to add minimap changes)
This commit is contained in:
@@ -126,7 +126,6 @@ namespace MapConverter
|
|||||||
{Pair.New("cnc","WINTER"),Pair.New("win","winter.col")},
|
{Pair.New("cnc","WINTER"),Pair.New("win","winter.col")},
|
||||||
};
|
};
|
||||||
|
|
||||||
TileSet tileset;
|
|
||||||
public void ConvertIniMap(string iniFile)
|
public void ConvertIniMap(string iniFile)
|
||||||
{
|
{
|
||||||
IniFile file = new IniFile(FileSystem.Open(iniFile));
|
IniFile file = new IniFile(FileSystem.Open(iniFile));
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ namespace OpenRA.Editor
|
|||||||
}
|
}
|
||||||
|
|
||||||
string loadedMapName;
|
string loadedMapName;
|
||||||
string colors;
|
|
||||||
string currentMod = "ra";
|
string currentMod = "ra";
|
||||||
TileSet tileset;
|
TileSet tileset;
|
||||||
|
|
||||||
|
|||||||
@@ -176,7 +176,6 @@ namespace OpenRA
|
|||||||
{
|
{
|
||||||
if (IsDead) return; /* overkill! don't count extra hits as more kills! */
|
if (IsDead) return; /* overkill! don't count extra hits as more kills! */
|
||||||
|
|
||||||
var rawDamage = damage;
|
|
||||||
var oldState = GetDamageState();
|
var oldState = GetDamageState();
|
||||||
|
|
||||||
/* apply the damage modifiers, if we have any. */
|
/* apply the damage modifiers, if we have any. */
|
||||||
|
|||||||
@@ -36,8 +36,6 @@ namespace OpenRA
|
|||||||
SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } }
|
SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } }
|
||||||
SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } }
|
SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } }
|
||||||
|
|
||||||
internal MapStub currentMap;
|
|
||||||
|
|
||||||
public Chrome(Renderer r, Manifest m)
|
public Chrome(Renderer r, Manifest m)
|
||||||
{
|
{
|
||||||
this.renderer = r;
|
this.renderer = r;
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ namespace OpenRA
|
|||||||
world = new World(manifest, map);
|
world = new World(manifest, map);
|
||||||
Timer.Time("world: {0}");
|
Timer.Time("world: {0}");
|
||||||
|
|
||||||
SequenceProvider.Initialize(manifest.Sequences, map.Theater);
|
SequenceProvider.Initialize(manifest.Sequences);
|
||||||
Timer.Time("ChromeProv, SeqProv: {0}");
|
Timer.Time("ChromeProv, SeqProv: {0}");
|
||||||
|
|
||||||
chrome = new Chrome(renderer, manifest);
|
chrome = new Chrome(renderer, manifest);
|
||||||
|
|||||||
@@ -32,22 +32,16 @@ namespace OpenRA.Graphics
|
|||||||
readonly World world;
|
readonly World world;
|
||||||
Sheet sheet;
|
Sheet sheet;
|
||||||
SpriteRenderer rgbaRenderer;
|
SpriteRenderer rgbaRenderer;
|
||||||
LineRenderer lineRenderer;
|
|
||||||
Sprite sprite;
|
Sprite sprite;
|
||||||
Bitmap terrain, customLayer;
|
Bitmap terrain, customLayer;
|
||||||
Rectangle bounds;
|
Rectangle bounds;
|
||||||
|
|
||||||
Sprite ownedSpawnPoint;
|
|
||||||
Sprite unownedSpawnPoint;
|
|
||||||
|
|
||||||
const int alpha = 230;
|
const int alpha = 230;
|
||||||
|
|
||||||
public Minimap(World world, Renderer r)
|
public Minimap(World world, Renderer r)
|
||||||
{
|
{
|
||||||
this.world = world;
|
this.world = world;
|
||||||
sheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y));
|
sheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y));
|
||||||
|
|
||||||
lineRenderer = new LineRenderer(r);
|
|
||||||
rgbaRenderer = r.RgbaSpriteRenderer;
|
rgbaRenderer = r.RgbaSpriteRenderer;
|
||||||
var size = Math.Max(world.Map.Width, world.Map.Height);
|
var size = Math.Max(world.Map.Width, world.Map.Height);
|
||||||
var dw = (size - world.Map.Width) / 2;
|
var dw = (size - world.Map.Width) / 2;
|
||||||
@@ -58,9 +52,6 @@ namespace OpenRA.Graphics
|
|||||||
sprite = new Sprite(sheet, bounds, TextureChannel.Alpha);
|
sprite = new Sprite(sheet, bounds, TextureChannel.Alpha);
|
||||||
|
|
||||||
shroudColor = Color.FromArgb(alpha, Color.Black);
|
shroudColor = Color.FromArgb(alpha, Color.Black);
|
||||||
|
|
||||||
ownedSpawnPoint = ChromeProvider.GetImage(r, "spawnpoints", "owned");
|
|
||||||
unownedSpawnPoint = ChromeProvider.GetImage(r, "spawnpoints", "unowned");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Rectangle MakeMinimapBounds(Map m)
|
public static Rectangle MakeMinimapBounds(Map m)
|
||||||
|
|||||||
@@ -31,13 +31,11 @@ namespace OpenRA.Graphics
|
|||||||
{
|
{
|
||||||
static Dictionary<string, Dictionary<string, Sequence>> units;
|
static Dictionary<string, Dictionary<string, Sequence>> units;
|
||||||
static Dictionary<string, CursorSequence> cursors;
|
static Dictionary<string, CursorSequence> cursors;
|
||||||
static string currentTheater;
|
|
||||||
|
|
||||||
public static void Initialize(string[] sequenceFiles, string theater)
|
public static void Initialize(string[] sequenceFiles)
|
||||||
{
|
{
|
||||||
units = new Dictionary<string, Dictionary<string, Sequence>>();
|
units = new Dictionary<string, Dictionary<string, Sequence>>();
|
||||||
cursors = new Dictionary<string, CursorSequence>();
|
cursors = new Dictionary<string, CursorSequence>();
|
||||||
currentTheater = theater;
|
|
||||||
|
|
||||||
foreach (var f in sequenceFiles)
|
foreach (var f in sequenceFiles)
|
||||||
LoadSequenceSource(f);
|
LoadSequenceSource(f);
|
||||||
|
|||||||
@@ -33,13 +33,12 @@ namespace OpenRA.Mods.RA
|
|||||||
class RepairButtonInfo : ITraitInfo
|
class RepairButtonInfo : ITraitInfo
|
||||||
{
|
{
|
||||||
public readonly bool RequiresConstructionYard = true;
|
public readonly bool RequiresConstructionYard = true;
|
||||||
public object Create(ActorInitializer init) { return new RepairButton(this); }
|
public object Create(ActorInitializer init) { return new RepairButton(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
class RepairButton : IChromeButton
|
class RepairButton : IChromeButton
|
||||||
{
|
{
|
||||||
RepairButtonInfo info;
|
public RepairButton() { }
|
||||||
public RepairButton( RepairButtonInfo info ) { this.info = info; }
|
|
||||||
|
|
||||||
public string Image { get { return "repair"; } }
|
public string Image { get { return "repair"; } }
|
||||||
public bool Enabled
|
public bool Enabled
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA
|
|||||||
//if (!underCursor.Info.Traits.Get<CargoInfo>().PassengerTypes.Contains(umt))
|
//if (!underCursor.Info.Traits.Get<CargoInfo>().PassengerTypes.Contains(umt))
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
return new Order("EnterTransport", self, underCursor);
|
//return new Order("EnterTransport", self, underCursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
public string CursorForOrderString(string s, Actor a, int2 location)
|
public string CursorForOrderString(string s, Actor a, int2 location)
|
||||||
|
|||||||
@@ -17,8 +17,7 @@ namespace OpenRA.Mods.RA
|
|||||||
.Select(id => self.World.Actors.FirstOrDefault(a => a.ActorID == id))
|
.Select(id => self.World.Actors.FirstOrDefault(a => a.ActorID == id))
|
||||||
.Where(a => a != null);
|
.Where(a => a != null);
|
||||||
|
|
||||||
var g = new Group(actors);
|
new Group(actors);
|
||||||
// g.Dump();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user