From b4c84a11f24c36e4983a64ef4f4fd2e777ad10fb Mon Sep 17 00:00:00 2001
From: Bob <ytinasni@gmail.com>
Date: Fri, 30 Jul 2010 20:15:14 +1200
Subject: [PATCH] changes to allow widgets to be in mods/;    moved
 BuildPaletteWidget into mods/

---
 OpenRA.Game/Game.cs                                        | 2 +-
 OpenRA.Game/Graphics/ChromeProvider.cs                     | 2 +-
 OpenRA.Game/Graphics/SpriteSheetBuilder.cs                 | 2 +-
 OpenRA.Game/Graphics/Viewport.cs                           | 2 +-
 OpenRA.Game/OpenRA.Game.csproj                             | 7 +------
 OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs          | 2 +-
 OpenRA.Game/Traits/Player/ProductionQueue.cs               | 6 +++---
 OpenRA.Game/Widgets/WidgetUtils.cs                         | 2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                       | 4 +++-
 .../Widgets/BuildPaletteWidget.cs                          | 0
 .../World/ChoosePaletteOnSelect.cs                         | 0
 11 files changed, 13 insertions(+), 16 deletions(-)
 rename {OpenRA.Game => OpenRA.Mods.RA}/Widgets/BuildPaletteWidget.cs (100%)
 mode change 100644 => 100755
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/World/ChoosePaletteOnSelect.cs (100%)
 mode change 100644 => 100755

diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index a52b79a341..05384ca3e6 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -36,7 +36,7 @@ namespace OpenRA
 		public static readonly int CellSize = 24;
 
 		public static World world;
-		internal static Viewport viewport;
+		public static Viewport viewport;
 		internal static UserSettings Settings;
 
 		internal static OrderManager orderManager;
diff --git a/OpenRA.Game/Graphics/ChromeProvider.cs b/OpenRA.Game/Graphics/ChromeProvider.cs
index 29322f8053..bce9c9eee0 100644
--- a/OpenRA.Game/Graphics/ChromeProvider.cs
+++ b/OpenRA.Game/Graphics/ChromeProvider.cs
@@ -16,7 +16,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
-	static class ChromeProvider
+	public static class ChromeProvider
 	{
 		static Dictionary<string, Dictionary<string, MappedImage>> collections;
 		static Dictionary<string, Sheet> cachedSheets;
diff --git a/OpenRA.Game/Graphics/SpriteSheetBuilder.cs b/OpenRA.Game/Graphics/SpriteSheetBuilder.cs
index b41d2b215c..d4a710df3a 100644
--- a/OpenRA.Game/Graphics/SpriteSheetBuilder.cs
+++ b/OpenRA.Game/Graphics/SpriteSheetBuilder.cs
@@ -13,7 +13,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
-	static class SpriteSheetBuilder
+	public static class SpriteSheetBuilder
 	{
 		public static void Initialize( TileSet tileset )
 		{
diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs
index 4fd9755136..e0d1ce7c57 100644
--- a/OpenRA.Game/Graphics/Viewport.cs
+++ b/OpenRA.Game/Graphics/Viewport.cs
@@ -17,7 +17,7 @@ using OpenRA.Widgets;
 
 namespace OpenRA.Graphics
 {
-	class Viewport
+	public class Viewport
 	{
 		readonly float2 screenSize;
 		float2 scrollPosition;
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index ec61b53f91..73314407da 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -125,7 +125,6 @@
     <Compile Include="Sync.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\World\SpatialBins.cs" />
-    <Compile Include="Traits\World\ChoosePaletteOnSelect.cs" />
     <Compile Include="Traits\World\Country.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="Cursor.cs" />
@@ -206,7 +205,6 @@
     <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
     <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
-    <Compile Include="Widgets\BuildPaletteWidget.cs" />
     <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="GameRules\MusicInfo.cs" />
@@ -266,7 +264,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Traits\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs
index 0a6dac90a6..1371b297c8 100644
--- a/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs
+++ b/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs
@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
-	class PlaceBuildingOrderGenerator : IOrderGenerator
+	public class PlaceBuildingOrderGenerator : IOrderGenerator
 	{
 		readonly Actor Producer;
 		readonly string Building;
diff --git a/OpenRA.Game/Traits/Player/ProductionQueue.cs b/OpenRA.Game/Traits/Player/ProductionQueue.cs
index accd8bc017..85f52039fe 100644
--- a/OpenRA.Game/Traits/Player/ProductionQueue.cs
+++ b/OpenRA.Game/Traits/Player/ProductionQueue.cs
@@ -15,14 +15,14 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
-	class ProductionQueueInfo : ITraitInfo
+	public class ProductionQueueInfo : ITraitInfo
 	{
 		public float BuildSpeed = 0.4f;
 		public readonly int LowPowerSlowdown = 3;
 		public object Create(ActorInitializer init) { return new ProductionQueue(init.self); }
 	}
 
-	class ProductionQueue : IResolveOrder, ITick
+	public class ProductionQueue : IResolveOrder, ITick
 	{
 		Actor self;
 
@@ -200,7 +200,7 @@ namespace OpenRA.Traits
 		}
 	}
 
-	class ProductionItem
+	public class ProductionItem
 	{
 		public readonly string Item;
 		
diff --git a/OpenRA.Game/Widgets/WidgetUtils.cs b/OpenRA.Game/Widgets/WidgetUtils.cs
index 17bed4c983..9379989af0 100644
--- a/OpenRA.Game/Widgets/WidgetUtils.cs
+++ b/OpenRA.Game/Widgets/WidgetUtils.cs
@@ -15,7 +15,7 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
-	static class WidgetUtils
+	public static class WidgetUtils
 	{
 		public static Sprite GetChromeImage(World world, string name)
 		{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index c539de55cb..81228cc75f 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -200,6 +200,7 @@
     <Compile Include="DefaultShellmapScript.cs" />
     <Compile Include="Wall.cs" />
     <Compile Include="WaterPaletteRotation.cs" />
+    <Compile Include="Widgets\BuildPaletteWidget.cs" />
     <Compile Include="WithMuzzleFlash.cs" />
     <Compile Include="WithShadow.cs" />
     <Compile Include="NukePaletteEffect.cs" />
@@ -225,6 +226,7 @@
     <Compile Include="Cloak.cs" />
     <Compile Include="Modifiers\FrozenUnderFog.cs" />
     <Compile Include="Modifiers\HiddenUnderFog.cs" />
+    <Compile Include="World\ChoosePaletteOnSelect.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Game/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Game/Widgets/BuildPaletteWidget.cs
rename to OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
diff --git a/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs b/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs
rename to OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs