diff --git a/MapConverter/MapConverter.cs b/MapConverter/MapConverter.cs index dd7a96a7b3..47fdc08c31 100644 --- a/MapConverter/MapConverter.cs +++ b/MapConverter/MapConverter.cs @@ -126,7 +126,6 @@ namespace MapConverter {Pair.New("cnc","WINTER"),Pair.New("win","winter.col")}, }; - TileSet tileset; public void ConvertIniMap(string iniFile) { IniFile file = new IniFile(FileSystem.Open(iniFile)); diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs index 29bb07b52f..cdb8792ba6 100644 --- a/OpenRA.Editor/Form1.cs +++ b/OpenRA.Editor/Form1.cs @@ -56,7 +56,6 @@ namespace OpenRA.Editor } string loadedMapName; - string colors; string currentMod = "ra"; TileSet tileset; diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 717221cb3b..2aab48ab9d 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -176,7 +176,6 @@ namespace OpenRA { if (IsDead) return; /* overkill! don't count extra hits as more kills! */ - var rawDamage = damage; var oldState = GetDamageState(); /* apply the damage modifiers, if we have any. */ diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index 94d003a24a..bfb71b5a53 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -36,8 +36,6 @@ namespace OpenRA SpriteRenderer rgbaRenderer { get { return renderer.RgbaSpriteRenderer; } } SpriteRenderer shpRenderer { get { return renderer.WorldSpriteRenderer; } } - internal MapStub currentMap; - public Chrome(Renderer r, Manifest m) { this.renderer = r; diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 57bc96df62..a7c8422b4f 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -154,7 +154,7 @@ namespace OpenRA world = new World(manifest, map); Timer.Time("world: {0}"); - SequenceProvider.Initialize(manifest.Sequences, map.Theater); + SequenceProvider.Initialize(manifest.Sequences); Timer.Time("ChromeProv, SeqProv: {0}"); chrome = new Chrome(renderer, manifest); diff --git a/OpenRA.Game/Graphics/Minimap.cs b/OpenRA.Game/Graphics/Minimap.cs index b7cb86eb91..c67e8370dd 100644 --- a/OpenRA.Game/Graphics/Minimap.cs +++ b/OpenRA.Game/Graphics/Minimap.cs @@ -32,13 +32,9 @@ namespace OpenRA.Graphics readonly World world; Sheet sheet; SpriteRenderer rgbaRenderer; - LineRenderer lineRenderer; Sprite sprite; Bitmap terrain, customLayer; Rectangle bounds; - - Sprite ownedSpawnPoint; - Sprite unownedSpawnPoint; const int alpha = 230; @@ -46,8 +42,6 @@ namespace OpenRA.Graphics { this.world = world; sheet = new Sheet(r, new Size(world.Map.MapSize.X, world.Map.MapSize.Y)); - - lineRenderer = new LineRenderer(r); rgbaRenderer = r.RgbaSpriteRenderer; var size = Math.Max(world.Map.Width, world.Map.Height); var dw = (size - world.Map.Width) / 2; @@ -58,9 +52,6 @@ namespace OpenRA.Graphics sprite = new Sprite(sheet, bounds, TextureChannel.Alpha); shroudColor = Color.FromArgb(alpha, Color.Black); - - ownedSpawnPoint = ChromeProvider.GetImage(r, "spawnpoints", "owned"); - unownedSpawnPoint = ChromeProvider.GetImage(r, "spawnpoints", "unowned"); } public static Rectangle MakeMinimapBounds(Map m) diff --git a/OpenRA.Game/Graphics/SequenceProvider.cs b/OpenRA.Game/Graphics/SequenceProvider.cs index 77cea88f3f..36a455e8de 100644 --- a/OpenRA.Game/Graphics/SequenceProvider.cs +++ b/OpenRA.Game/Graphics/SequenceProvider.cs @@ -31,13 +31,11 @@ namespace OpenRA.Graphics { static Dictionary> units; static Dictionary cursors; - static string currentTheater; - public static void Initialize(string[] sequenceFiles, string theater) + public static void Initialize(string[] sequenceFiles) { units = new Dictionary>(); cursors = new Dictionary(); - currentTheater = theater; foreach (var f in sequenceFiles) LoadSequenceSource(f); diff --git a/OpenRA.Mods.RA/Chrome/PowerDownButton.cs b/OpenRA.Mods.RA/Chrome/PowerDownButton.cs index d251799469..169232a425 100755 --- a/OpenRA.Mods.RA/Chrome/PowerDownButton.cs +++ b/OpenRA.Mods.RA/Chrome/PowerDownButton.cs @@ -33,13 +33,12 @@ namespace OpenRA.Mods.RA class RepairButtonInfo : ITraitInfo { 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 { - RepairButtonInfo info; - public RepairButton( RepairButtonInfo info ) { this.info = info; } + public RepairButton() { } public string Image { get { return "repair"; } } public bool Enabled diff --git a/OpenRA.Mods.RA/Passenger.cs b/OpenRA.Mods.RA/Passenger.cs index ef4ab6b70a..dba94add73 100644 --- a/OpenRA.Mods.RA/Passenger.cs +++ b/OpenRA.Mods.RA/Passenger.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA //if (!underCursor.Info.Traits.Get().PassengerTypes.Contains(umt)) return null; - return new Order("EnterTransport", self, underCursor); + //return new Order("EnterTransport", self, underCursor); } public string CursorForOrderString(string s, Actor a, int2 location) diff --git a/OpenRA.Mods.RA/Player/ActorGroupProxy.cs b/OpenRA.Mods.RA/Player/ActorGroupProxy.cs index de7d52c01e..8d2de99454 100755 --- a/OpenRA.Mods.RA/Player/ActorGroupProxy.cs +++ b/OpenRA.Mods.RA/Player/ActorGroupProxy.cs @@ -17,8 +17,7 @@ namespace OpenRA.Mods.RA .Select(id => self.World.Actors.FirstOrDefault(a => a.ActorID == id)) .Where(a => a != null); - var g = new Group(actors); - // g.Dump(); + new Group(actors); } } }