From ede160f1b6321c057ac4e64bc9f76b634a746c4b Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 30 Jul 2010 20:23:16 +1200 Subject: [PATCH] move some more (gameplay related) widgets into mods/ --- OpenRA.Game/Graphics/Minimap.cs | 2 +- OpenRA.Game/Graphics/Sheet.cs | 2 +- OpenRA.Game/Graphics/Sprite.cs | 2 +- OpenRA.Game/OpenRA.Game.csproj | 6 ------ OpenRA.Game/Traits/ProvidesRadar.cs | 4 ++-- OpenRA.Game/Widgets/ChatDisplayWidget.cs | 4 ++-- OpenRA.Game/Widgets/LabelWidget.cs | 2 +- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 6 ++++++ OpenRA.Mods.RA/RadarColorFromTerrain.cs | 14 ++++++-------- OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs | 3 ++- .../Widgets/Delegates/IngameChromeDelegate.cs | 5 +++-- .../Delegates/OrderButtonsChromeDelegate.cs | 7 +++---- .../Widgets/MoneyBinWidget.cs | 3 ++- .../Widgets/OrderButtonWidget.cs | 10 ++++++---- .../Widgets/PowerBinWidget.cs | 3 ++- .../Widgets/RadarBinWidget.cs | 3 ++- .../Widgets/SpecialPowerBinWidget.cs | 5 +++-- OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs | 3 ++- 18 files changed, 45 insertions(+), 39 deletions(-) rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/Delegates/IngameChromeDelegate.cs (95%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/MoneyBinWidget.cs (94%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/OrderButtonWidget.cs (97%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/PowerBinWidget.cs (95%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/RadarBinWidget.cs (96%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/SpecialPowerBinWidget.cs (98%) mode change 100644 => 100755 diff --git a/OpenRA.Game/Graphics/Minimap.cs b/OpenRA.Game/Graphics/Minimap.cs index cadffef4c6..a20247c541 100644 --- a/OpenRA.Game/Graphics/Minimap.cs +++ b/OpenRA.Game/Graphics/Minimap.cs @@ -17,7 +17,7 @@ using OpenRA.Traits; namespace OpenRA.Graphics { - class Minimap + public class Minimap { public static Bitmap TerrainBitmap(Map map) { diff --git a/OpenRA.Game/Graphics/Sheet.cs b/OpenRA.Game/Graphics/Sheet.cs index 0d1026576b..fef34f5d2a 100644 --- a/OpenRA.Game/Graphics/Sheet.cs +++ b/OpenRA.Game/Graphics/Sheet.cs @@ -20,7 +20,7 @@ namespace OpenRA.Graphics ITexture texture; bool dirty; - internal Sheet(Size size) + public Sheet(Size size) { this.bitmap = new Bitmap(size.Width, size.Height); } diff --git a/OpenRA.Game/Graphics/Sprite.cs b/OpenRA.Game/Graphics/Sprite.cs index 50995f3474..f667beb699 100644 --- a/OpenRA.Game/Graphics/Sprite.cs +++ b/OpenRA.Game/Graphics/Sprite.cs @@ -22,7 +22,7 @@ namespace OpenRA.Graphics readonly float2[] uvhax; - internal Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel) + public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel) { this.bounds = bounds; this.sheet = sheet; diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 73314407da..a36ae3e4a3 100755 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -90,10 +90,8 @@ - - @@ -200,15 +198,12 @@ - - - @@ -219,7 +214,6 @@ - diff --git a/OpenRA.Game/Traits/ProvidesRadar.cs b/OpenRA.Game/Traits/ProvidesRadar.cs index 37330c68bf..265d01189b 100644 --- a/OpenRA.Game/Traits/ProvidesRadar.cs +++ b/OpenRA.Game/Traits/ProvidesRadar.cs @@ -12,9 +12,9 @@ using System.Linq; namespace OpenRA.Traits { - class ProvidesRadarInfo : TraitInfo { } + public class ProvidesRadarInfo : TraitInfo { } - class ProvidesRadar : ITick + public class ProvidesRadar : ITick { public bool IsActive { get; private set; } diff --git a/OpenRA.Game/Widgets/ChatDisplayWidget.cs b/OpenRA.Game/Widgets/ChatDisplayWidget.cs index f5f5aebec8..73e82ac549 100644 --- a/OpenRA.Game/Widgets/ChatDisplayWidget.cs +++ b/OpenRA.Game/Widgets/ChatDisplayWidget.cs @@ -14,7 +14,7 @@ using System.Linq; namespace OpenRA.Widgets { - class ChatDisplayWidget : Widget + public class ChatDisplayWidget : Widget { public readonly int RemoveTime = 0; @@ -23,7 +23,7 @@ namespace OpenRA.Widgets public bool DrawBackground = true; int ticksUntilRemove = 0; - public List recentLines = new List(); + internal List recentLines = new List(); public ChatDisplayWidget() : base() { } diff --git a/OpenRA.Game/Widgets/LabelWidget.cs b/OpenRA.Game/Widgets/LabelWidget.cs index bfd172728b..3a078987e3 100644 --- a/OpenRA.Game/Widgets/LabelWidget.cs +++ b/OpenRA.Game/Widgets/LabelWidget.cs @@ -13,7 +13,7 @@ using System.Drawing; namespace OpenRA.Widgets { - class LabelWidget : Widget + public class LabelWidget : Widget { public enum TextAlign { Left, Center, Right } diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 81228cc75f..91d63d20fb 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -201,6 +201,12 @@ + + + + + + diff --git a/OpenRA.Mods.RA/RadarColorFromTerrain.cs b/OpenRA.Mods.RA/RadarColorFromTerrain.cs index d552affa51..88a3b8f18a 100644 --- a/OpenRA.Mods.RA/RadarColorFromTerrain.cs +++ b/OpenRA.Mods.RA/RadarColorFromTerrain.cs @@ -6,14 +6,12 @@ * as published by the Free Software Foundation. For more information, * see LICENSE. */ -#endregion +#endregion + +using System.Drawing; +using OpenRA.Traits; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using OpenRA.FileFormats; - -namespace OpenRA.Traits +namespace OpenRA.Mods.RA { public class RadarColorFromTerrainInfo : ITraitInfo { @@ -33,6 +31,6 @@ namespace OpenRA.Traits public Color RadarColorOverride(Actor self) { return c; - } + } } } \ No newline at end of file diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index ccbdb93c4f..014f4685fa 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -16,8 +16,9 @@ using OpenRA.FileFormats; using OpenRA.Graphics; using OpenRA.Orders; using OpenRA.Traits; +using OpenRA.Widgets; -namespace OpenRA.Widgets +namespace OpenRA.Mods.RA.Widgets { class BuildPaletteWidget : Widget { diff --git a/OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs old mode 100644 new mode 100755 similarity index 95% rename from OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs rename to OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs index 7015c5fcfe..89f8a27ac4 --- a/OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs @@ -9,8 +9,9 @@ #endregion using OpenRA.Traits; -using System.Linq; -namespace OpenRA.Widgets.Delegates +using OpenRA.Widgets; + +namespace OpenRA.Mods.RA.Widgets.Delegates { public class IngameChromeDelegate : IWidgetDelegate { diff --git a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs index 73299200c8..19a46682bf 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs @@ -1,4 +1,3 @@ - #region Copyright & License Information /* * Copyright 2007-2010 The OpenRA Developers (see AUTHORS) @@ -7,10 +6,10 @@ * as published by the Free Software Foundation. For more information, * see LICENSE. */ -#endregion - +#endregion + +using OpenRA.Mods.RA.Orders; using OpenRA.Widgets; -using OpenRA.Mods.RA.Orders; namespace OpenRA.Mods.RA.Widgets.Delegates { diff --git a/OpenRA.Game/Widgets/MoneyBinWidget.cs b/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs old mode 100644 new mode 100755 similarity index 94% rename from OpenRA.Game/Widgets/MoneyBinWidget.cs rename to OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs index 3c54443eee..528561586e --- a/OpenRA.Game/Widgets/MoneyBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs @@ -15,8 +15,9 @@ using System.Linq; using OpenRA.FileFormats; using OpenRA.Graphics; using OpenRA.Traits; +using OpenRA.Widgets; -namespace OpenRA.Widgets +namespace OpenRA.Mods.RA.Widgets { class MoneyBinWidget : Widget { diff --git a/OpenRA.Game/Widgets/OrderButtonWidget.cs b/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs old mode 100644 new mode 100755 similarity index 97% rename from OpenRA.Game/Widgets/OrderButtonWidget.cs rename to OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs index 4253f34e69..5024aeb904 --- a/OpenRA.Game/Widgets/OrderButtonWidget.cs +++ b/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs @@ -1,7 +1,9 @@ -using System; -using OpenRA.Graphics; -using System.Drawing; -namespace OpenRA.Widgets +using System; +using System.Drawing; +using OpenRA.Graphics; +using OpenRA.Widgets; + +namespace OpenRA.Mods.RA.Widgets { public class OrderButtonWidget : ButtonWidget { diff --git a/OpenRA.Game/Widgets/PowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs old mode 100644 new mode 100755 similarity index 95% rename from OpenRA.Game/Widgets/PowerBinWidget.cs rename to OpenRA.Mods.RA/Widgets/PowerBinWidget.cs index b79e1090e2..c99c0763b3 --- a/OpenRA.Game/Widgets/PowerBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs @@ -12,8 +12,9 @@ using System; using System.Drawing; using OpenRA.Graphics; using OpenRA.Traits; +using OpenRA.Widgets; -namespace OpenRA.Widgets +namespace OpenRA.Mods.RA.Widgets { public class PowerBinWidget : Widget { diff --git a/OpenRA.Game/Widgets/RadarBinWidget.cs b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs old mode 100644 new mode 100755 similarity index 96% rename from OpenRA.Game/Widgets/RadarBinWidget.cs rename to OpenRA.Mods.RA/Widgets/RadarBinWidget.cs index 0a981595e1..3d89e1918b --- a/OpenRA.Game/Widgets/RadarBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs @@ -12,8 +12,9 @@ using System.Drawing; using System.Linq; using OpenRA.Graphics; using OpenRA.Traits; +using OpenRA.Widgets; -namespace OpenRA.Widgets +namespace OpenRA.Mods.RA.Widgets { public class RadarBinWidget : Widget { diff --git a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs old mode 100644 new mode 100755 similarity index 98% rename from OpenRA.Game/Widgets/SpecialPowerBinWidget.cs rename to OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs index 4a176db968..b587d78d9b --- a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs @@ -14,9 +14,10 @@ using System.Drawing; using System.Linq; using OpenRA.FileFormats; using OpenRA.Graphics; -using OpenRA.Traits; +using OpenRA.Traits; +using OpenRA.Widgets; -namespace OpenRA.Widgets +namespace OpenRA.Mods.RA.Widgets { class SpecialPowerBinWidget : Widget { diff --git a/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs b/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs index 7cf0913dc9..907f515b5b 100755 --- a/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs +++ b/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs @@ -9,9 +9,10 @@ #endregion using System.Linq; +using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Traits +namespace OpenRA.Mods.RA.Widgets { class ChoosePaletteOnSelectInfo : TraitInfo { }