diff --git a/OpenRa.FileFormats/AudLoader.cs b/OpenRa.FileFormats/AudLoader.cs index 5248897cfa..1d9a376760 100644 --- a/OpenRa.FileFormats/AudLoader.cs +++ b/OpenRa.FileFormats/AudLoader.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.IO; namespace OpenRa.FileFormats diff --git a/OpenRa.FileFormats/Blowfish.cs b/OpenRa.FileFormats/Blowfish.cs index 5446449b56..a22203d42a 100644 --- a/OpenRa.FileFormats/Blowfish.cs +++ b/OpenRa.FileFormats/Blowfish.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/BlowfishKeyProvider.cs b/OpenRa.FileFormats/BlowfishKeyProvider.cs index 137104e75a..373d321e6d 100644 --- a/OpenRa.FileFormats/BlowfishKeyProvider.cs +++ b/OpenRa.FileFormats/BlowfishKeyProvider.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Linq; namespace OpenRa.FileFormats diff --git a/OpenRa.FileFormats/Dune2ShpReader.cs b/OpenRa.FileFormats/Dune2ShpReader.cs index 5b5a634c5f..df73dc660a 100644 --- a/OpenRa.FileFormats/Dune2ShpReader.cs +++ b/OpenRa.FileFormats/Dune2ShpReader.cs @@ -1,10 +1,7 @@ -using System; +using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Collections; -using System.IO; using System.Drawing; +using System.IO; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/FileSystem.cs b/OpenRa.FileFormats/FileSystem.cs index 8a923f8363..d8e1259159 100644 --- a/OpenRa.FileFormats/FileSystem.cs +++ b/OpenRa.FileFormats/FileSystem.cs @@ -1,8 +1,5 @@ -using System; using System.Collections.Generic; -using System.Text; using System.IO; -using OpenRa.FileFormats; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/Folder.cs b/OpenRa.FileFormats/Folder.cs index 7f75880c26..04cb36fd3d 100644 --- a/OpenRa.FileFormats/Folder.cs +++ b/OpenRa.FileFormats/Folder.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using System.IO; namespace OpenRa.FileFormats diff --git a/OpenRa.FileFormats/Format2.cs b/OpenRa.FileFormats/Format2.cs index 72e9ca9af0..962b9f3d74 100644 --- a/OpenRa.FileFormats/Format2.cs +++ b/OpenRa.FileFormats/Format2.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.FileFormats { public static class Format2 diff --git a/OpenRa.FileFormats/Format40.cs b/OpenRa.FileFormats/Format40.cs index 9f9e5264b1..a25c0d35fc 100644 --- a/OpenRa.FileFormats/Format40.cs +++ b/OpenRa.FileFormats/Format40.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/Format80.cs b/OpenRa.FileFormats/Format80.cs index f8138a5fe4..380dd0001a 100644 --- a/OpenRa.FileFormats/Format80.cs +++ b/OpenRa.FileFormats/Format80.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; -using System.IO; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/IniFile.cs b/OpenRa.FileFormats/IniFile.cs index cd77862583..22029faae3 100644 --- a/OpenRa.FileFormats/IniFile.cs +++ b/OpenRa.FileFormats/IniFile.cs @@ -1,9 +1,8 @@ using System; +using System.Collections; using System.Collections.Generic; -using System.Text; using System.IO; using System.Text.RegularExpressions; -using System.Collections; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/IniWriter.cs b/OpenRa.FileFormats/IniWriter.cs index fc1b326ab4..0bc875a219 100644 --- a/OpenRa.FileFormats/IniWriter.cs +++ b/OpenRa.FileFormats/IniWriter.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.IO; using System.Runtime.InteropServices; -using System.IO; +using System.Text; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/Map.cs b/OpenRa.FileFormats/Map.cs index fa5c8956dc..c888d97df8 100644 --- a/OpenRa.FileFormats/Map.cs +++ b/OpenRa.FileFormats/Map.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using System.Text; using System.IO; -using System.Drawing; -using System.Linq; +using System.Text; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/Package.cs b/OpenRa.FileFormats/Package.cs index 3c86266141..8bb504d5fc 100644 --- a/OpenRa.FileFormats/Package.cs +++ b/OpenRa.FileFormats/Package.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; using System.IO; using System.Linq; diff --git a/OpenRa.FileFormats/PackageEntry.cs b/OpenRa.FileFormats/PackageEntry.cs index 106925b020..fbc4e7babf 100644 --- a/OpenRa.FileFormats/PackageEntry.cs +++ b/OpenRa.FileFormats/PackageEntry.cs @@ -1,7 +1,6 @@ -using System; using System.Collections.Generic; -using System.Text; using System.IO; +using System.Text; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/Palette.cs b/OpenRa.FileFormats/Palette.cs index f366157d5c..6244913786 100644 --- a/OpenRa.FileFormats/Palette.cs +++ b/OpenRa.FileFormats/Palette.cs @@ -1,8 +1,6 @@ -using System; using System.Collections.Generic; -using System.Text; -using System.IO; using System.Drawing; +using System.IO; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/PaletteRemap.cs b/OpenRa.FileFormats/PaletteRemap.cs index 92fda46b50..ecd6de41cb 100644 --- a/OpenRa.FileFormats/PaletteRemap.cs +++ b/OpenRa.FileFormats/PaletteRemap.cs @@ -1,8 +1,6 @@ -using System; using System.Collections.Generic; -using System.Text; -using System.IO; using System.Drawing; +using System.IO; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/ShpReader.cs b/OpenRa.FileFormats/ShpReader.cs index 3e4ccaf73a..4e0cc24372 100644 --- a/OpenRa.FileFormats/ShpReader.cs +++ b/OpenRa.FileFormats/ShpReader.cs @@ -1,9 +1,7 @@ -using System; +using System.Collections; using System.Collections.Generic; -using System.Text; using System.Drawing; using System.IO; -using System.Collections; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/Terrain.cs b/OpenRa.FileFormats/Terrain.cs index dba709d3c6..1c760d2f0d 100644 --- a/OpenRa.FileFormats/Terrain.cs +++ b/OpenRa.FileFormats/Terrain.cs @@ -1,8 +1,5 @@ -using System; using System.Collections.Generic; -using System.Text; using System.IO; -using System.Drawing; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/TileReference.cs b/OpenRa.FileFormats/TileReference.cs index fa6a90f249..dd62758ae5 100644 --- a/OpenRa.FileFormats/TileReference.cs +++ b/OpenRa.FileFormats/TileReference.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/TileSet.cs b/OpenRa.FileFormats/TileSet.cs index a2ed6b6ceb..6ea58a157d 100644 --- a/OpenRa.FileFormats/TileSet.cs +++ b/OpenRa.FileFormats/TileSet.cs @@ -1,8 +1,6 @@ -using System; using System.Collections.Generic; -using System.Text; -using System.IO; using System.Globalization; +using System.IO; namespace OpenRa.FileFormats { diff --git a/OpenRa.FileFormats/TreeReference.cs b/OpenRa.FileFormats/TreeReference.cs index 994a1bad94..9310bdeea7 100644 --- a/OpenRa.FileFormats/TreeReference.cs +++ b/OpenRa.FileFormats/TreeReference.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using System.Drawing; namespace OpenRa.FileFormats diff --git a/OpenRa.FileFormats/Walkability.cs b/OpenRa.FileFormats/Walkability.cs index e7404f969b..7ddfceab71 100644 --- a/OpenRa.FileFormats/Walkability.cs +++ b/OpenRa.FileFormats/Walkability.cs @@ -1,7 +1,4 @@ -using System; using System.Collections.Generic; -using System.Text; -using System.IO; using System.Text.RegularExpressions; namespace OpenRa.FileFormats diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs index 5fbdf6dcd2..bad86845d1 100755 --- a/OpenRa.Game/Actor.cs +++ b/OpenRa.Game/Actor.cs @@ -1,13 +1,9 @@ using System; using System.Collections.Generic; -using System.IO; +using System.Drawing; using System.Linq; -using System.Text; -using IjwFramework.Types; -using OpenRa.FileFormats; using OpenRa.Game.GameRules; using OpenRa.Game.Graphics; -using System.Drawing; using OpenRa.Game.Traits; using OpenRa.Game.Traits.Activities; @@ -47,13 +43,6 @@ namespace OpenRa.Game + "; add Traits= to units.ini for appropriate unit" ); } - //public Actor( TreeReference tree, TreeCache treeRenderer ) - //{ - // ActorID = 0xffffffff; - // Location = new int2( tree.Location ); - // traits.Add( new Traits.Tree( treeRenderer.GetImage( tree.Image ) ) ); - //} - public void Tick() { var nextActivity = currentActivity; diff --git a/OpenRa.Game/BuildingInfluenceMap.cs b/OpenRa.Game/BuildingInfluenceMap.cs index 3bf091472d..2fe7d29d90 100644 --- a/OpenRa.Game/BuildingInfluenceMap.cs +++ b/OpenRa.Game/BuildingInfluenceMap.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using IjwFramework.Types; using OpenRa.Game.GameRules; -using IjwFramework.Types; -using IjwFramework.Collections; -using OpenRa.Game.Graphics; using OpenRa.Game.Traits; namespace OpenRa.Game diff --git a/OpenRa.Game/Bullet.cs b/OpenRa.Game/Bullet.cs index 0eacf93c17..ec4498f9f3 100644 --- a/OpenRa.Game/Bullet.cs +++ b/OpenRa.Game/Bullet.cs @@ -1,20 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using OpenRa.Game.GameRules; -using IjwFramework.Types; using OpenRa.Game.Graphics; namespace OpenRa.Game { - interface IEffect - { - void Tick(); - IEnumerable> Render(); - Player Owner { get; } - } - class Bullet : IEffect { public Player Owner { get; private set; } diff --git a/OpenRa.Game/Chat.cs b/OpenRa.Game/Chat.cs index 746962132f..64312d96c6 100644 --- a/OpenRa.Game/Chat.cs +++ b/OpenRa.Game/Chat.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using IjwFramework.Types; +using System.Collections.Generic; using System.Drawing; namespace OpenRa.Game diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs index 21f1d271e2..26124c55a7 100644 --- a/OpenRa.Game/Chrome.cs +++ b/OpenRa.Game/Chrome.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; +using System.Drawing; using System.Linq; -using System.Text; +using System.Windows.Forms; +using IjwFramework.Collections; +using IjwFramework.Types; using OpenRa.Game.Graphics; using OpenRa.Game.Support; -using System.Drawing; -using IjwFramework.Types; -using IjwFramework.Collections; -using System.Windows.Forms; namespace OpenRa.Game { diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs index b83b754253..c183edcf7d 100644 --- a/OpenRa.Game/Controller.cs +++ b/OpenRa.Game/Controller.cs @@ -1,13 +1,10 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using System.Windows.Forms; using IjwFramework.Types; -using System.Drawing; -using OpenRa.Game.Traits; -using OpenRa.Game.Graphics; using OpenRa.Game.GameRules; +using OpenRa.Game.Graphics; +using OpenRa.Game.Traits; namespace OpenRa.Game { diff --git a/OpenRa.Game/Cursor.cs b/OpenRa.Game/Cursor.cs index 537f223f31..04e7eefc05 100644 --- a/OpenRa.Game/Cursor.cs +++ b/OpenRa.Game/Cursor.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using OpenRa.Game.Graphics; -using System.IO; +using OpenRa.Game.Graphics; namespace OpenRa.Game { diff --git a/OpenRa.Game/Explosion.cs b/OpenRa.Game/Explosion.cs index 1180031d3f..f98c67a637 100644 --- a/OpenRa.Game/Explosion.cs +++ b/OpenRa.Game/Explosion.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using OpenRa.Game.Graphics; -using IjwFramework.Types; -using OpenRa.Game.GameRules; namespace OpenRa.Game { diff --git a/OpenRa.Game/Exts.cs b/OpenRa.Game/Exts.cs index fc53555d6f..7ebaab3e1e 100644 --- a/OpenRa.Game/Exts.cs +++ b/OpenRa.Game/Exts.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game { static class Exts diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index e8685ab72d..fb8f16ed25 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -2,16 +2,15 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Linq; +using System.Net.Sockets; using IjwFramework.Collections; using IjwFramework.Types; using IrrKlang; using OpenRa.FileFormats; using OpenRa.Game.GameRules; using OpenRa.Game.Graphics; -using OpenRa.Game.Traits; using OpenRa.Game.Support; -using System.Net.Sockets; -using System.Windows.Forms; +using OpenRa.Game.Traits; namespace OpenRa.Game { diff --git a/OpenRa.Game/GameRules/FieldLoader.cs b/OpenRa.Game/GameRules/FieldLoader.cs index 97ef6d72b3..a71ef3fc36 100755 --- a/OpenRa.Game/GameRules/FieldLoader.cs +++ b/OpenRa.Game/GameRules/FieldLoader.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using OpenRa.FileFormats; namespace OpenRa.Game.GameRules diff --git a/OpenRa.Game/GameRules/Footprint.cs b/OpenRa.Game/GameRules/Footprint.cs index 2438f4755f..2a2311496d 100644 --- a/OpenRa.Game/GameRules/Footprint.cs +++ b/OpenRa.Game/GameRules/Footprint.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.IO; -using OpenRa.Game.Graphics; namespace OpenRa.Game.GameRules { diff --git a/OpenRa.Game/GameRules/GeneralInfo.cs b/OpenRa.Game/GameRules/GeneralInfo.cs index 99a2ee81d4..8d55eb5c38 100644 --- a/OpenRa.Game/GameRules/GeneralInfo.cs +++ b/OpenRa.Game/GameRules/GeneralInfo.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.GameRules { class GeneralInfo diff --git a/OpenRa.Game/GameRules/ProjectileInfo.cs b/OpenRa.Game/GameRules/ProjectileInfo.cs index 8521d91c8c..db21594967 100644 --- a/OpenRa.Game/GameRules/ProjectileInfo.cs +++ b/OpenRa.Game/GameRules/ProjectileInfo.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.GameRules { class ProjectileInfo diff --git a/OpenRa.Game/GameRules/Rules.cs b/OpenRa.Game/GameRules/Rules.cs index 412114f1d2..ae32557ecd 100755 --- a/OpenRa.Game/GameRules/Rules.cs +++ b/OpenRa.Game/GameRules/Rules.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; +using IjwFramework.Types; using OpenRa.FileFormats; using OpenRa.Game.GameRules; -using IjwFramework.Types; namespace OpenRa.Game { diff --git a/OpenRa.Game/GameRules/TechTree.cs b/OpenRa.Game/GameRules/TechTree.cs index bfd2a04e08..6793affc68 100755 --- a/OpenRa.Game/GameRules/TechTree.cs +++ b/OpenRa.Game/GameRules/TechTree.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using IjwFramework.Collections; namespace OpenRa.Game.GameRules diff --git a/OpenRa.Game/GameRules/UnitInfo.cs b/OpenRa.Game/GameRules/UnitInfo.cs index a4e6d05cd5..88cd30ded6 100755 --- a/OpenRa.Game/GameRules/UnitInfo.cs +++ b/OpenRa.Game/GameRules/UnitInfo.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using OpenRa.FileFormats; -using OpenRa.Game.Graphics; -using IjwFramework.Types; - + namespace OpenRa.Game.GameRules { public enum ArmorType diff --git a/OpenRa.Game/GameRules/WarheadInfo.cs b/OpenRa.Game/GameRules/WarheadInfo.cs index db0d306b4e..758373f5ef 100644 --- a/OpenRa.Game/GameRules/WarheadInfo.cs +++ b/OpenRa.Game/GameRules/WarheadInfo.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using OpenRa.FileFormats; -using OpenRa.Game.Graphics; - + namespace OpenRa.Game.GameRules { class WarheadInfo diff --git a/OpenRa.Game/GameRules/WeaponInfo.cs b/OpenRa.Game/GameRules/WeaponInfo.cs index 4dfe1fc01d..66938c5490 100755 --- a/OpenRa.Game/GameRules/WeaponInfo.cs +++ b/OpenRa.Game/GameRules/WeaponInfo.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using OpenRa.FileFormats; -using OpenRa.Game.Graphics; - + namespace OpenRa.Game.GameRules { class WeaponInfo diff --git a/OpenRa.Game/Graphics/CursorSequence.cs b/OpenRa.Game/Graphics/CursorSequence.cs index 57cf7cd628..76b2e23e49 100644 --- a/OpenRa.Game/Graphics/CursorSequence.cs +++ b/OpenRa.Game/Graphics/CursorSequence.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; +using System.Xml; namespace OpenRa.Game.Graphics { diff --git a/OpenRa.Game/Graphics/CursorSheetBuilder.cs b/OpenRa.Game/Graphics/CursorSheetBuilder.cs index 195d00a6a5..f26c078902 100644 --- a/OpenRa.Game/Graphics/CursorSheetBuilder.cs +++ b/OpenRa.Game/Graphics/CursorSheetBuilder.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using OpenRa.FileFormats; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/Graphics/HardwarePalette.cs b/OpenRa.Game/Graphics/HardwarePalette.cs index 61a7ea9343..e447545842 100644 --- a/OpenRa.Game/Graphics/HardwarePalette.cs +++ b/OpenRa.Game/Graphics/HardwarePalette.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Ijw.DirectX; using System.Drawing; -using System.IO; using OpenRa.FileFormats; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/Graphics/LineRenderer.cs b/OpenRa.Game/Graphics/LineRenderer.cs index acbf6aeb2a..87b2b85c21 100644 --- a/OpenRa.Game/Graphics/LineRenderer.cs +++ b/OpenRa.Game/Graphics/LineRenderer.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Drawing; using Ijw.DirectX; -using System.Runtime.InteropServices; -using System.Drawing; namespace OpenRa.Game.Graphics { diff --git a/OpenRa.Game/Graphics/OverlayRenderer.cs b/OpenRa.Game/Graphics/OverlayRenderer.cs index 0df11be438..fad810527c 100755 --- a/OpenRa.Game/Graphics/OverlayRenderer.cs +++ b/OpenRa.Game/Graphics/OverlayRenderer.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using OpenRa.FileFormats; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/Graphics/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs index ba9c893c37..7476de583d 100644 --- a/OpenRa.Game/Graphics/Renderer.cs +++ b/OpenRa.Game/Graphics/Renderer.cs @@ -1,4 +1,3 @@ -using System; using System.Drawing; using System.Windows.Forms; using Ijw.DirectX; diff --git a/OpenRa.Game/Graphics/SequenceProvider.cs b/OpenRa.Game/Graphics/SequenceProvider.cs index e26cecac44..5578309e9d 100644 --- a/OpenRa.Game/Graphics/SequenceProvider.cs +++ b/OpenRa.Game/Graphics/SequenceProvider.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using System.Xml; using System.Linq; +using System.Xml; using OpenRa.FileFormats; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/Graphics/Sheet.cs b/OpenRa.Game/Graphics/Sheet.cs index c96ec51d23..437304d6d1 100644 --- a/OpenRa.Game/Graphics/Sheet.cs +++ b/OpenRa.Game/Graphics/Sheet.cs @@ -1,8 +1,6 @@ using System.Drawing; -using System.IO; using Ijw.DirectX; using OpenRa.FileFormats; -using System.Drawing.Imaging; namespace OpenRa.Game.Graphics { diff --git a/OpenRa.Game/Graphics/SheetBuilder.cs b/OpenRa.Game/Graphics/SheetBuilder.cs index e126966d1d..6b09296967 100644 --- a/OpenRa.Game/Graphics/SheetBuilder.cs +++ b/OpenRa.Game/Graphics/SheetBuilder.cs @@ -25,14 +25,6 @@ namespace OpenRa.Game.Graphics return Add(data, size); } - public static void ForceNewSheet() - { - if( p == Point.Empty ) - return; - current = NewSheet(); - channel = NextChannel(null); - } - static Sheet NewSheet() { return new Sheet( renderer, new Size( Renderer.SheetSize, Renderer.SheetSize ) ); } static Renderer renderer; diff --git a/OpenRa.Game/Graphics/Sprite.cs b/OpenRa.Game/Graphics/Sprite.cs index 5f3b699159..a9f7247f37 100644 --- a/OpenRa.Game/Graphics/Sprite.cs +++ b/OpenRa.Game/Graphics/Sprite.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using System.Drawing; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/Graphics/SpriteRenderer.cs b/OpenRa.Game/Graphics/SpriteRenderer.cs index 9277f3f4d5..6d3c026b6c 100644 --- a/OpenRa.Game/Graphics/SpriteRenderer.cs +++ b/OpenRa.Game/Graphics/SpriteRenderer.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using OpenRa.FileFormats; -using System.Drawing; using Ijw.DirectX; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/Graphics/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs index 2e5cb8b0ec..07d4263984 100644 --- a/OpenRa.Game/Graphics/TerrainRenderer.cs +++ b/OpenRa.Game/Graphics/TerrainRenderer.cs @@ -1,5 +1,4 @@ -using System.Drawing; -using System.Windows.Forms; +using System.Drawing; using Ijw.DirectX; using IjwFramework.Collections; using OpenRa.FileFormats; @@ -22,8 +21,6 @@ namespace OpenRa.Game.Graphics this.map = map; Size tileSize = new Size( Game.CellSize, Game.CellSize ); - - // SheetBuilder.ForceNewSheet(); var tileMapping = new Cache( x => SheetBuilder.Add(Rules.TileSet.GetBytes(x), tileSize)); diff --git a/OpenRa.Game/Graphics/Viewport.cs b/OpenRa.Game/Graphics/Viewport.cs index 148736fec8..f0345a5b0e 100644 --- a/OpenRa.Game/Graphics/Viewport.cs +++ b/OpenRa.Game/Graphics/Viewport.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System; using System.Linq; namespace OpenRa.Game.Graphics diff --git a/OpenRa.Game/IEffect.cs b/OpenRa.Game/IEffect.cs new file mode 100644 index 0000000000..503023b686 --- /dev/null +++ b/OpenRa.Game/IEffect.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using OpenRa.Game.Graphics; + +namespace OpenRa.Game +{ + interface IEffect + { + void Tick(); + IEnumerable> Render(); + Player Owner { get; } + } +} diff --git a/OpenRa.Game/IOrderGenerator.cs b/OpenRa.Game/IOrderGenerator.cs index fe62112832..76f71e8121 100644 --- a/OpenRa.Game/IOrderGenerator.cs +++ b/OpenRa.Game/IOrderGenerator.cs @@ -1,6 +1,4 @@ -using System; using System.Collections.Generic; -using System.Text; namespace OpenRa.Game { diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs index aea92176a8..73294f573b 100755 --- a/OpenRa.Game/MainWindow.cs +++ b/OpenRa.Game/MainWindow.cs @@ -1,11 +1,10 @@ +using System; using System.Drawing; +using System.IO; +using System.Runtime.InteropServices; using System.Windows.Forms; using OpenRa.FileFormats; using OpenRa.Game.Graphics; -using System.Runtime.InteropServices; -using OpenRa.Game.Traits; -using System.IO; -using System; namespace OpenRa.Game { diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index 97009a120c..647204394d 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -82,6 +82,7 @@ + diff --git a/OpenRa.Game/Order.cs b/OpenRa.Game/Order.cs index 7b07969f49..a41cd65c4b 100644 --- a/OpenRa.Game/Order.cs +++ b/OpenRa.Game/Order.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; -using System.Linq; -using OpenRa.Game.Traits; using System.IO; +using System.Linq; namespace OpenRa.Game { diff --git a/OpenRa.Game/OrderIO.cs b/OpenRa.Game/OrderIO.cs index 8a2d048058..dafc95aa31 100644 --- a/OpenRa.Game/OrderIO.cs +++ b/OpenRa.Game/OrderIO.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.IO; namespace OpenRa.Game diff --git a/OpenRa.Game/Smudge.cs b/OpenRa.Game/Smudge.cs index 85109fd76f..cebd3c2c47 100644 --- a/OpenRa.Game/Smudge.cs +++ b/OpenRa.Game/Smudge.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game { static class Smudge diff --git a/OpenRa.Game/Support/Log.cs b/OpenRa.Game/Support/Log.cs index 194ac41f4c..3c3a3098d1 100644 --- a/OpenRa.Game/Support/Log.cs +++ b/OpenRa.Game/Support/Log.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using System.IO; namespace OpenRa.Game diff --git a/OpenRa.Game/Support/PerfHistory.cs b/OpenRa.Game/Support/PerfHistory.cs index bad5cd80c0..1b05dc49ad 100644 --- a/OpenRa.Game/Support/PerfHistory.cs +++ b/OpenRa.Game/Support/PerfHistory.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using IjwFramework.Collections; using System.Drawing; +using System.Linq; +using IjwFramework.Collections; using OpenRa.Game.Graphics; namespace OpenRa.Game.Support diff --git a/OpenRa.Game/Support/Program.cs b/OpenRa.Game/Support/Program.cs index 4592fc56e2..60a9d3b6fd 100644 --- a/OpenRa.Game/Support/Program.cs +++ b/OpenRa.Game/Support/Program.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; -using System.Windows.Forms; -using System.IO; +using System.Diagnostics; namespace OpenRa.Game { @@ -10,7 +8,7 @@ namespace OpenRa.Game [STAThread] static void Main( string[] args ) { - if( System.Diagnostics.Debugger.IsAttached ) + if( Debugger.IsAttached ) { Run( args ); return; diff --git a/OpenRa.Game/Support/Stopwatch.cs b/OpenRa.Game/Support/Stopwatch.cs index 2ab329402f..7de2257a07 100644 --- a/OpenRa.Game/Support/Stopwatch.cs +++ b/OpenRa.Game/Support/Stopwatch.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; namespace OpenRa.Game.Support { diff --git a/OpenRa.Game/Traits/AcceptsOre.cs b/OpenRa.Game/Traits/AcceptsOre.cs index a391c58ca7..d511d79dd2 100644 --- a/OpenRa.Game/Traits/AcceptsOre.cs +++ b/OpenRa.Game/Traits/AcceptsOre.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using OpenRa.Game.Traits.Activities; +using OpenRa.Game.Traits.Activities; namespace OpenRa.Game.Traits { @@ -9,17 +6,16 @@ namespace OpenRa.Game.Traits { public AcceptsOre(Actor self) { - // if (!Game.skipMakeAnims) - Game.world.AddFrameEndTask( - w => - { /* create the free harvester! */ - var harvester = new Actor("harv", self.Location + new int2(1, 2), self.Owner); - var unit = harvester.traits.Get(); - var mobile = harvester.traits.Get(); - unit.Facing = 64; - harvester.QueueActivity(new Harvest()); - w.Add(harvester); - }); + Game.world.AddFrameEndTask( + w => + { /* create the free harvester! */ + var harvester = new Actor("harv", self.Location + new int2(1, 2), self.Owner); + var unit = harvester.traits.Get(); + var mobile = harvester.traits.Get(); + unit.Facing = 64; + harvester.QueueActivity(new Harvest()); + w.Add(harvester); + }); } } } diff --git a/OpenRa.Game/Traits/Activities/Attack.cs b/OpenRa.Game/Traits/Activities/Attack.cs index 1e2b633d74..908efe790e 100644 --- a/OpenRa.Game/Traits/Activities/Attack.cs +++ b/OpenRa.Game/Traits/Activities/Attack.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; namespace OpenRa.Game.Traits.Activities { diff --git a/OpenRa.Game/Traits/Activities/DeliverOre.cs b/OpenRa.Game/Traits/Activities/DeliverOre.cs index c81d6ee416..c93d7dc817 100644 --- a/OpenRa.Game/Traits/Activities/DeliverOre.cs +++ b/OpenRa.Game/Traits/Activities/DeliverOre.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; namespace OpenRa.Game.Traits.Activities { diff --git a/OpenRa.Game/Traits/Activities/DeployMcv.cs b/OpenRa.Game/Traits/Activities/DeployMcv.cs index bd08bd44c8..2957c8323d 100755 --- a/OpenRa.Game/Traits/Activities/DeployMcv.cs +++ b/OpenRa.Game/Traits/Activities/DeployMcv.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace OpenRa.Game.Traits.Activities { diff --git a/OpenRa.Game/Traits/Activities/Follow.cs b/OpenRa.Game/Traits/Activities/Follow.cs index f7433f3835..16b27b7f12 100644 --- a/OpenRa.Game/Traits/Activities/Follow.cs +++ b/OpenRa.Game/Traits/Activities/Follow.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits.Activities { class Follow : IActivity diff --git a/OpenRa.Game/Traits/Activities/Harvest.cs b/OpenRa.Game/Traits/Activities/Harvest.cs index 481b8faf93..dfbc2023ff 100644 --- a/OpenRa.Game/Traits/Activities/Harvest.cs +++ b/OpenRa.Game/Traits/Activities/Harvest.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; namespace OpenRa.Game.Traits.Activities { diff --git a/OpenRa.Game/Traits/Activities/IActivity.cs b/OpenRa.Game/Traits/Activities/IActivity.cs index db58dfec56..7fb2b43d21 100644 --- a/OpenRa.Game/Traits/Activities/IActivity.cs +++ b/OpenRa.Game/Traits/Activities/IActivity.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits.Activities { interface IActivity diff --git a/OpenRa.Game/Traits/Activities/Move.cs b/OpenRa.Game/Traits/Activities/Move.cs index a484557bdd..0096c5e5e0 100755 --- a/OpenRa.Game/Traits/Activities/Move.cs +++ b/OpenRa.Game/Traits/Activities/Move.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using OpenRa.Game.GameRules; -using System.Diagnostics; namespace OpenRa.Game.Traits.Activities { diff --git a/OpenRa.Game/Traits/Activities/Turn.cs b/OpenRa.Game/Traits/Activities/Turn.cs index acfd145421..3d79961729 100755 --- a/OpenRa.Game/Traits/Activities/Turn.cs +++ b/OpenRa.Game/Traits/Activities/Turn.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits.Activities { class Turn : IActivity diff --git a/OpenRa.Game/Traits/Building.cs b/OpenRa.Game/Traits/Building.cs index 70e6dc18dd..4b68e497d4 100644 --- a/OpenRa.Game/Traits/Building.cs +++ b/OpenRa.Game/Traits/Building.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using OpenRa.Game.GameRules; +using OpenRa.Game.GameRules; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/Harvester.cs b/OpenRa.Game/Traits/Harvester.cs index 111d4b0ef1..5828e424b3 100644 --- a/OpenRa.Game/Traits/Harvester.cs +++ b/OpenRa.Game/Traits/Harvester.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits { class Harvester : IOrder diff --git a/OpenRa.Game/Traits/Helicopter.cs b/OpenRa.Game/Traits/Helicopter.cs index 96ba1316d2..d20c0cf556 100644 --- a/OpenRa.Game/Traits/Helicopter.cs +++ b/OpenRa.Game/Traits/Helicopter.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using OpenRa.Game.GameRules; namespace OpenRa.Game.Traits diff --git a/OpenRa.Game/Traits/InfantrySquad.cs b/OpenRa.Game/Traits/InfantrySquad.cs index fb51ce2a1d..65c38c6c31 100644 --- a/OpenRa.Game/Traits/InfantrySquad.cs +++ b/OpenRa.Game/Traits/InfantrySquad.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using OpenRa.Game.Graphics; -using IjwFramework.Types; using OpenRa.Game.GameRules; +using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/McvDeploy.cs b/OpenRa.Game/Traits/McvDeploy.cs index 1465a72dce..2858bdcf96 100644 --- a/OpenRa.Game/Traits/McvDeploy.cs +++ b/OpenRa.Game/Traits/McvDeploy.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using OpenRa.Game.GameRules; +using OpenRa.Game.GameRules; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/Mobile.cs b/OpenRa.Game/Traits/Mobile.cs index 709450d712..80048e2bbd 100644 --- a/OpenRa.Game/Traits/Mobile.cs +++ b/OpenRa.Game/Traits/Mobile.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using OpenRa.Game.GameRules; -using OpenRa.Game.Graphics; -using OpenRa.Game.Traits.Activities; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/Production.cs b/OpenRa.Game/Traits/Production.cs index fb777dfab4..8dd5b75d1a 100755 --- a/OpenRa.Game/Traits/Production.cs +++ b/OpenRa.Game/Traits/Production.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using OpenRa.Game.GameRules; +using OpenRa.Game.GameRules; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RallyPoint.cs b/OpenRa.Game/Traits/RallyPoint.cs index e6927cb547..63eb7906bd 100644 --- a/OpenRa.Game/Traits/RallyPoint.cs +++ b/OpenRa.Game/Traits/RallyPoint.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using IjwFramework.Types; +using System.Collections.Generic; using OpenRa.Game.Graphics; -using OpenRa.Game.GameRules; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RenderBuilding.cs b/OpenRa.Game/Traits/RenderBuilding.cs index bb3872c8e7..c27f9ddd87 100644 --- a/OpenRa.Game/Traits/RenderBuilding.cs +++ b/OpenRa.Game/Traits/RenderBuilding.cs @@ -1,12 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using IjwFramework.Types; using OpenRa.Game.Graphics; -using OpenRa.Game.GameRules; -using OpenRa.FileFormats; -using OpenRa.Game; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RenderBuildingOre.cs b/OpenRa.Game/Traits/RenderBuildingOre.cs index 1465c7def7..761362a292 100644 --- a/OpenRa.Game/Traits/RenderBuildingOre.cs +++ b/OpenRa.Game/Traits/RenderBuildingOre.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits { class RenderBuildingOre : RenderBuilding diff --git a/OpenRa.Game/Traits/RenderBuildingTurreted.cs b/OpenRa.Game/Traits/RenderBuildingTurreted.cs index 0825e8fa70..7f062b10d8 100644 --- a/OpenRa.Game/Traits/RenderBuildingTurreted.cs +++ b/OpenRa.Game/Traits/RenderBuildingTurreted.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits { class RenderBuildingTurreted : RenderBuilding diff --git a/OpenRa.Game/Traits/RenderBuildingWarFactory.cs b/OpenRa.Game/Traits/RenderBuildingWarFactory.cs index 095aa1df3a..d0923938f8 100644 --- a/OpenRa.Game/Traits/RenderBuildingWarFactory.cs +++ b/OpenRa.Game/Traits/RenderBuildingWarFactory.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using OpenRa.Game.Graphics; -using IjwFramework.Types; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RenderSimple.cs b/OpenRa.Game/Traits/RenderSimple.cs index abee7174ad..19a4481e91 100644 --- a/OpenRa.Game/Traits/RenderSimple.cs +++ b/OpenRa.Game/Traits/RenderSimple.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using OpenRa.Game.Graphics; -using IjwFramework.Types; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RenderUnit.cs b/OpenRa.Game/Traits/RenderUnit.cs index 14f7e97adf..685074198c 100644 --- a/OpenRa.Game/Traits/RenderUnit.cs +++ b/OpenRa.Game/Traits/RenderUnit.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using OpenRa.Game.Graphics; -using IjwFramework.Types; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RenderUnitMuzzleFlash.cs b/OpenRa.Game/Traits/RenderUnitMuzzleFlash.cs index 424410fe93..4f5b86509e 100644 --- a/OpenRa.Game/Traits/RenderUnitMuzzleFlash.cs +++ b/OpenRa.Game/Traits/RenderUnitMuzzleFlash.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits diff --git a/OpenRa.Game/Traits/RenderUnitReload.cs b/OpenRa.Game/Traits/RenderUnitReload.cs index c7e6fa5339..e09f6381f1 100644 --- a/OpenRa.Game/Traits/RenderUnitReload.cs +++ b/OpenRa.Game/Traits/RenderUnitReload.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/RenderUnitRotor.cs b/OpenRa.Game/Traits/RenderUnitRotor.cs index 21ea82fa62..65b6e29c23 100755 --- a/OpenRa.Game/Traits/RenderUnitRotor.cs +++ b/OpenRa.Game/Traits/RenderUnitRotor.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using IjwFramework.Types; +using System.Collections.Generic; using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits diff --git a/OpenRa.Game/Traits/RenderUnitSpinner.cs b/OpenRa.Game/Traits/RenderUnitSpinner.cs index aa42a18949..57b9a2c4ba 100755 --- a/OpenRa.Game/Traits/RenderUnitSpinner.cs +++ b/OpenRa.Game/Traits/RenderUnitSpinner.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits diff --git a/OpenRa.Game/Traits/RenderUnitTurreted.cs b/OpenRa.Game/Traits/RenderUnitTurreted.cs index 548ef646b3..b50e2f317b 100644 --- a/OpenRa.Game/Traits/RenderUnitTurreted.cs +++ b/OpenRa.Game/Traits/RenderUnitTurreted.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using OpenRa.Game.Graphics; -using IjwFramework.Types; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/SeedsOre.cs b/OpenRa.Game/Traits/SeedsOre.cs index f41a34076b..98bb98ab9e 100644 --- a/OpenRa.Game/Traits/SeedsOre.cs +++ b/OpenRa.Game/Traits/SeedsOre.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits { class SeedsOre : ITick { public SeedsOre( Actor self ) {} - const double OreSeedProbability = .05; + const double OreSeedProbability = .05; // todo: push this out into rules public void Tick(Actor self) { diff --git a/OpenRa.Game/Traits/TraitsInterfaces.cs b/OpenRa.Game/Traits/TraitsInterfaces.cs index a05ddf72aa..1bff833d32 100644 --- a/OpenRa.Game/Traits/TraitsInterfaces.cs +++ b/OpenRa.Game/Traits/TraitsInterfaces.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using OpenRa.Game.Graphics; -using IjwFramework.Types; +using System.Collections.Generic; using OpenRa.Game.GameRules; +using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/Tree.cs b/OpenRa.Game/Traits/Tree.cs index 44cfd7c1a6..5b4621730f 100644 --- a/OpenRa.Game/Traits/Tree.cs +++ b/OpenRa.Game/Traits/Tree.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using OpenRa.Game.Graphics; -using IjwFramework.Types; namespace OpenRa.Game.Traits { diff --git a/OpenRa.Game/Traits/Turreted.cs b/OpenRa.Game/Traits/Turreted.cs index c8935b267c..2e1ad6fd91 100644 --- a/OpenRa.Game/Traits/Turreted.cs +++ b/OpenRa.Game/Traits/Turreted.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits { class Turreted : ITick diff --git a/OpenRa.Game/Traits/Unit.cs b/OpenRa.Game/Traits/Unit.cs index b144a0b6a1..6c8a2013ae 100755 --- a/OpenRa.Game/Traits/Unit.cs +++ b/OpenRa.Game/Traits/Unit.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.Traits { class Unit diff --git a/OpenRa.Game/Traits/Util.cs b/OpenRa.Game/Traits/Util.cs index 65fa119ae0..6fabf69d49 100755 --- a/OpenRa.Game/Traits/Util.cs +++ b/OpenRa.Game/Traits/Util.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using IjwFramework.Types; using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits