diff --git a/Makefile b/Makefile
index eda1d91dcf..706f87adba 100644
--- a/Makefile
+++ b/Makefile
@@ -146,8 +146,8 @@ mod_cnc: $(mod_cnc_TARGET)
mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_ra_TARGET) $(mod_cnc_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET) $(mod_cnc_TARGET)
+mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
PROGRAMS += mod_d2k
mod_d2k: $(mod_d2k_TARGET)
diff --git a/OpenRA.Mods.Common/Graphics/TextRenderable.cs b/OpenRA.Mods.Common/Graphics/TextRenderable.cs
index d4a91ab4e5..d0c03fa601 100644
--- a/OpenRA.Mods.Common/Graphics/TextRenderable.cs
+++ b/OpenRA.Mods.Common/Graphics/TextRenderable.cs
@@ -12,7 +12,7 @@ using System;
using System.Drawing;
using OpenRA.Graphics;
-namespace OpenRA.Mods.RA.Graphics
+namespace OpenRA.Mods.Common.Graphics
{
public struct TextRenderable : IRenderable
{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 055640da0b..6e06486e91 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -46,6 +46,8 @@
+
+
@@ -69,8 +71,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenRA.Mods.RA/PaletteFromFile.cs b/OpenRA.Mods.Common/PaletteFromFile.cs
similarity index 98%
rename from OpenRA.Mods.RA/PaletteFromFile.cs
rename to OpenRA.Mods.Common/PaletteFromFile.cs
index fbad644494..8aeda5d10b 100644
--- a/OpenRA.Mods.RA/PaletteFromFile.cs
+++ b/OpenRA.Mods.Common/PaletteFromFile.cs
@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
{
class PaletteFromFileInfo : ITraitInfo
{
diff --git a/OpenRA.Mods.RA/ProvidesRadar.cs b/OpenRA.Mods.Common/Traits/ProvidesRadar.cs
old mode 100755
new mode 100644
similarity index 91%
rename from OpenRA.Mods.RA/ProvidesRadar.cs
rename to OpenRA.Mods.Common/Traits/ProvidesRadar.cs
index 176180b359..abd9249342
--- a/OpenRA.Mods.RA/ProvidesRadar.cs
+++ b/OpenRA.Mods.Common/Traits/ProvidesRadar.cs
@@ -11,7 +11,7 @@
using System.Linq;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor enables the radar minimap.")]
public class ProvidesRadarInfo : TraitInfo { }
@@ -35,11 +35,11 @@ namespace OpenRA.Mods.RA
}
[Desc("When an actor with this trait is in range of an actor with ProvidesRadar, it will temporarily disable the radar minimap for the enemy player.")]
- class JamsRadarInfo : TraitInfo
+ public class JamsRadarInfo : TraitInfo
{
[Desc("Range for jamming.")]
public readonly int Range = 0;
}
- class JamsRadar { }
+ public class JamsRadar { }
}
diff --git a/OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
old mode 100755
new mode 100644
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs
rename to OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
index 647913bb5c..43717ce3e1
--- a/OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
@@ -14,7 +14,7 @@ using System.Threading;
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class ColorMixerWidget : Widget
{
diff --git a/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs b/OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs
old mode 100755
new mode 100644
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs
rename to OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs
index 304fa2f500..9d08445a17
--- a/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs
@@ -12,7 +12,7 @@
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class ColorPreviewManagerWidget : Widget
{
diff --git a/OpenRA.Mods.RA/Widgets/ConfirmationDialogs.cs b/OpenRA.Mods.Common/Widgets/ConfirmationDialogs.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/ConfirmationDialogs.cs
rename to OpenRA.Mods.Common/Widgets/ConfirmationDialogs.cs
index c7f693e4b6..a5f043f8ac 100644
--- a/OpenRA.Mods.RA/Widgets/ConfirmationDialogs.cs
+++ b/OpenRA.Mods.Common/Widgets/ConfirmationDialogs.cs
@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public static class ConfirmationDialogs
{
diff --git a/OpenRA.Mods.RA/Widgets/HueSliderWidget.cs b/OpenRA.Mods.Common/Widgets/HueSliderWidget.cs
old mode 100755
new mode 100644
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/HueSliderWidget.cs
rename to OpenRA.Mods.Common/Widgets/HueSliderWidget.cs
index c5e0cf7514..0e31f6c446
--- a/OpenRA.Mods.RA/Widgets/HueSliderWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/HueSliderWidget.cs
@@ -13,7 +13,7 @@ using System.Drawing.Imaging;
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class HueSliderWidget : SliderWidget
{
diff --git a/OpenRA.Mods.RA/Widgets/LabelWithTooltipWidget.cs b/OpenRA.Mods.Common/Widgets/LabelWithTooltipWidget.cs
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/LabelWithTooltipWidget.cs
rename to OpenRA.Mods.Common/Widgets/LabelWithTooltipWidget.cs
index 58ef367714..70a6863c10 100644
--- a/OpenRA.Mods.RA/Widgets/LabelWithTooltipWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/LabelWithTooltipWidget.cs
@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class LabelWithTooltipWidget : LabelWidget
{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
index 43e8812d98..41a5d8586f 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
@@ -17,7 +17,7 @@ using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
{
public class AssetBrowserLogic
{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
similarity index 92%
rename from OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
index 09aae264dc..a2d42e72b6 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
@@ -12,7 +12,7 @@ using System;
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
{
public class ColorPickerLogic
{
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var preview = widget.Get("PREVIEW");
var anim = preview.GetAnimation();
anim.PlayRepeating(anim.CurrentSequence.Name);
- ticker.OnTick = () => anim.Tick();
+ ticker.OnTick = anim.Tick;
}
var hueSlider = widget.Get("HUE");
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var randomButton = widget.GetOrNull("RANDOM_BUTTON");
hueSlider.OnChange += _ => mixer.Set(hueSlider.Value);
- mixer.OnChange += () => onChange(mixer.Color);
+ mixer.OnChange += () => onChange(mixer.Color);
if (randomButton != null)
randomButton.OnClick = () =>
diff --git a/OpenRA.Mods.RA/Widgets/Logic/DisconnectWatcherLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs
similarity index 62%
rename from OpenRA.Mods.RA/Widgets/Logic/DisconnectWatcherLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs
index dc780ee678..8fdaf4aa30 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/DisconnectWatcherLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs
@@ -11,7 +11,7 @@
using OpenRA.Network;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
{
public class DisconnectWatcherLogic
{
@@ -21,20 +21,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var disconnected = false;
widget.Get("DISCONNECT_WATCHER").OnTick = () =>
{
- if (!disconnected && orderManager.Connection.ConnectionState == ConnectionState.NotConnected)
- {
- Game.RunAfterTick(() =>
- {
- Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
- {
- { "orderManager", orderManager },
- { "onAbort", null },
- { "onRetry", null }
- });
- });
+ if (disconnected || orderManager.Connection.ConnectionState != ConnectionState.NotConnected)
+ return;
- disconnected = true;
- }
+ Game.RunAfterTick(() => Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs {
+ { "orderManager", orderManager },
+ { "onAbort", null },
+ { "onRetry", null }
+ }));
+
+ disconnected = true;
};
}
}
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
similarity index 95%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
index 7d4a7d4ec2..0dc2120133 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
@@ -10,10 +10,10 @@
using System.Drawing;
using System.Linq;
-using OpenRA.Mods.RA.Widgets;
+using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
{
public class IngameRadarDisplayLogic
{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
similarity index 92%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
index a981fed98c..3a002f50d2 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
{
public class LoadIngamePlayerOrObserverUILogic
{
@@ -37,18 +37,17 @@ namespace OpenRA.Mods.RA.Widgets.Logic
playerRoot.RemoveChildren();
Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
});
-
};
}
Game.LoadWidget(world, "CHAT_PANEL", ingameRoot, new WidgetArgs());
- Action ShowLeaveMapWidget = () =>
+ Action showLeaveMapWidget = () =>
{
ingameRoot.RemoveChildren();
Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs());
};
- world.GameOver += ShowLeaveMapWidget;
+ world.GameOver += showLeaveMapWidget;
}
}
}
diff --git a/OpenRA.Mods.RA/Widgets/LogicKeyListenerWidget.cs b/OpenRA.Mods.Common/Widgets/LogicKeyListenerWidget.cs
similarity index 93%
rename from OpenRA.Mods.RA/Widgets/LogicKeyListenerWidget.cs
rename to OpenRA.Mods.Common/Widgets/LogicKeyListenerWidget.cs
index 5fca8c630d..071cdc5fab 100644
--- a/OpenRA.Mods.RA/Widgets/LogicKeyListenerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/LogicKeyListenerWidget.cs
@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class LogicKeyListenerWidget : Widget
{
diff --git a/OpenRA.Mods.RA/Widgets/LogicTickerWidget.cs b/OpenRA.Mods.Common/Widgets/LogicTickerWidget.cs
similarity index 93%
rename from OpenRA.Mods.RA/Widgets/LogicTickerWidget.cs
rename to OpenRA.Mods.Common/Widgets/LogicTickerWidget.cs
index e48ff33e59..13839e020f 100644
--- a/OpenRA.Mods.RA/Widgets/LogicTickerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/LogicTickerWidget.cs
@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class LogicTickerWidget : Widget
{
diff --git a/OpenRA.Mods.RA/Widgets/MenuButtonWidget.cs b/OpenRA.Mods.Common/Widgets/MenuButtonWidget.cs
similarity index 95%
rename from OpenRA.Mods.RA/Widgets/MenuButtonWidget.cs
rename to OpenRA.Mods.Common/Widgets/MenuButtonWidget.cs
index 7b72d94fee..cb565a5eb5 100644
--- a/OpenRA.Mods.RA/Widgets/MenuButtonWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/MenuButtonWidget.cs
@@ -10,7 +10,7 @@
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class MenuButtonWidget : ButtonWidget
{
diff --git a/OpenRA.Mods.RA/Widgets/RadarWidget.cs b/OpenRA.Mods.Common/Widgets/RadarWidget.cs
old mode 100755
new mode 100644
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/RadarWidget.cs
rename to OpenRA.Mods.Common/Widgets/RadarWidget.cs
index 9f717f46c7..6091f50e95
--- a/OpenRA.Mods.RA/Widgets/RadarWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/RadarWidget.cs
@@ -14,7 +14,7 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public class RadarWidget : Widget
{
diff --git a/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs b/OpenRA.Mods.Common/Widgets/ResourceBarWidget.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs
rename to OpenRA.Mods.Common/Widgets/ResourceBarWidget.cs
index 0e0aefc64f..0c13ed6274 100644
--- a/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ResourceBarWidget.cs
@@ -13,7 +13,7 @@ using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
{
public enum ResourceBarOrientation { Vertical, Horizontal }
public enum ResourceBarStyle { Flat, Bevelled }
diff --git a/OpenRA.Mods.RA/World/RadarPings.cs b/OpenRA.Mods.Common/World/RadarPings.cs
similarity index 98%
rename from OpenRA.Mods.RA/World/RadarPings.cs
rename to OpenRA.Mods.Common/World/RadarPings.cs
index 1a0cd22dc2..cc65dc886f 100644
--- a/OpenRA.Mods.RA/World/RadarPings.cs
+++ b/OpenRA.Mods.Common/World/RadarPings.cs
@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
{
public class RadarPingsInfo : ITraitInfo
{
diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
index badfb90ee7..e547daf283 100644
--- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
@@ -96,6 +96,10 @@ cd "$(SolutionDir)"
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}
OpenRA.Game
+
+ {fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}
+ OpenRA.Mods.Common
+
{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}
OpenRA.Mods.RA
@@ -119,8 +123,5 @@ cd "$(SolutionDir)"
-
-
-
-
+
\ No newline at end of file
diff --git a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
index 26e5579724..6a79edab70 100644
--- a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
@@ -18,6 +18,8 @@ using OpenRA.Mods.RA.Widgets.Logic;
using OpenRA.Mods.D2k.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;
+using OpenRA.Mods.Common.Widgets;
+using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.D2k.Widgets.Logic
{
diff --git a/OpenRA.Mods.RA/Effects/FloatingText.cs b/OpenRA.Mods.RA/Effects/FloatingText.cs
index d2a42db315..ac55ad6391 100644
--- a/OpenRA.Mods.RA/Effects/FloatingText.cs
+++ b/OpenRA.Mods.RA/Effects/FloatingText.cs
@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Effects;
using OpenRA.Graphics;
-using OpenRA.Mods.RA.Graphics;
+using OpenRA.Mods.Common.Graphics;
namespace OpenRA.Mods.RA.Effects
{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 1401a4b0a2..e8f77812c7 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -277,7 +277,6 @@
-
@@ -299,12 +298,10 @@
-
-
@@ -377,7 +374,6 @@
-
@@ -388,7 +384,6 @@
-
@@ -407,7 +402,6 @@
-
@@ -421,7 +415,6 @@
-
@@ -432,11 +425,8 @@
-
-
-
@@ -445,7 +435,6 @@
-
@@ -470,7 +459,6 @@
-
@@ -482,12 +470,10 @@
-
-
@@ -535,7 +521,6 @@
-
@@ -545,10 +530,7 @@
-
-
-
diff --git a/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs b/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
index 4927bc4e56..efb0b6adaf 100644
--- a/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
+++ b/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
+using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs b/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs
index 1816d47414..3f678d98dc 100644
--- a/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs
+++ b/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs
@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
+using OpenRA.Mods.Common;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Player/PlaceBeacon.cs b/OpenRA.Mods.RA/Player/PlaceBeacon.cs
index d7a1b5da01..52580f8835 100644
--- a/OpenRA.Mods.RA/Player/PlaceBeacon.cs
+++ b/OpenRA.Mods.RA/Player/PlaceBeacon.cs
@@ -8,6 +8,7 @@
*/
#endregion
+using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Render/RenderNameTag.cs b/OpenRA.Mods.RA/Render/RenderNameTag.cs
index d017ea6d74..f91cb27029 100644
--- a/OpenRA.Mods.RA/Render/RenderNameTag.cs
+++ b/OpenRA.Mods.RA/Render/RenderNameTag.cs
@@ -11,7 +11,7 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
-using OpenRA.Mods.RA.Graphics;
+using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
diff --git a/OpenRA.Mods.RA/RenderJammerCircle.cs b/OpenRA.Mods.RA/RenderJammerCircle.cs
index 9b7e31376f..fb94d20e3f 100644
--- a/OpenRA.Mods.RA/RenderJammerCircle.cs
+++ b/OpenRA.Mods.RA/RenderJammerCircle.cs
@@ -12,11 +12,12 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
- //todo: remove all the Render*Circle duplication
+ // TODO: remove all the Render*Circle duplication
class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecoration
{
public IEnumerable Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
@@ -29,8 +30,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsMissiles.Range),
0,
Color.FromArgb(128, Color.Red),
- Color.FromArgb(96, Color.Black)
- );
+ Color.FromArgb(96, Color.Black));
}
var jamsRadar = ai.Traits.GetOrDefault();
@@ -41,8 +41,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsRadar.Range),
0,
Color.FromArgb(128, Color.Blue),
- Color.FromArgb(96, Color.Black)
- );
+ Color.FromArgb(96, Color.Black));
}
foreach (var a in w.ActorsWithTrait())
@@ -73,8 +72,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsMissiles.Range),
0,
Color.FromArgb(128, Color.Red),
- Color.FromArgb(96, Color.Black)
- );
+ Color.FromArgb(96, Color.Black));
}
var jamsRadar = self.Info.Traits.GetOrDefault();
@@ -85,8 +83,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsRadar.Range),
0,
Color.FromArgb(128, Color.Blue),
- Color.FromArgb(96, Color.Black)
- );
+ Color.FromArgb(96, Color.Black));
}
}
}
diff --git a/OpenRA.Mods.RA/SupportPowers/SupportPower.cs b/OpenRA.Mods.RA/SupportPowers/SupportPower.cs
index a1cea59d42..c91c8d4ac0 100755
--- a/OpenRA.Mods.RA/SupportPowers/SupportPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/SupportPower.cs
@@ -8,6 +8,7 @@
*/
#endregion
+using OpenRA.Mods.Common;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
index 95c2db8bab..4fd712753d 100644
--- a/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
+++ b/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
+using OpenRA.Mods.Common;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
index 082cbecc65..37bad035f3 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
@@ -13,6 +13,7 @@ using System.Linq;
using OpenRA.Mods.RA.Widgets;
using OpenRA.Network;
using OpenRA.Widgets;
+using OpenRA.Mods.Common.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
index d189e84f2e..afedbc8b5e 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
@@ -9,6 +9,7 @@
#endregion
using System;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs
index 09353fd932..93b9319c6f 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs
@@ -9,6 +9,7 @@
#endregion
using OpenRA.Graphics;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
index cf3ae7323a..ab22616dd9 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
@@ -8,6 +8,7 @@
*/
#endregion
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
index 11e70d8fde..5c531312ab 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.RA.Power;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
index b0b26ae7d3..a2cf8dfd3d 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
@@ -8,9 +8,10 @@
*/
#endregion
+using System.Drawing;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.RA.Power;
using OpenRA.Widgets;
-using System.Drawing;
namespace OpenRA.Mods.RA.Widgets.Logic
{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
index ea35b15a8c..c15aa9d1af 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
index eff7114022..369f6841fe 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
@@ -9,11 +9,8 @@
#endregion
using System;
-using System.Linq;
using OpenRA.Graphics;
-using OpenRA.Mods.RA;
-using OpenRA.Mods.RA.Widgets;
-using OpenRA.Traits;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index df242f6edb..1277861c43 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -14,6 +14,7 @@ using System.Drawing;
using System.Linq;
using System.Threading;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Traits;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
index 61ea828793..6666db589b 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Primitives;
using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
index ebe69cc28b..05492094e8 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
index f17e72ea77..e0b6e7860f 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
@@ -13,6 +13,7 @@ using System.Linq;
using OpenRA.Mods.RA.Orders;
using OpenRA.Widgets;
using OpenRA.Traits;
+using OpenRA.Mods.Common.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs
index d087f76fc5..404d27f323 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using OpenRA.FileFormats;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Primitives;
using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
index 6a00c809b0..99de7937b9 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
index 027b133649..b10378e5b2 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
@@ -12,6 +12,7 @@ using System;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
+using OpenRA.Mods.Common;
using OpenRA.Orders;
using OpenRA.Primitives;
using OpenRA.Widgets;