changes to allow widgets to be in mods/; moved BuildPaletteWidget into mods/

This commit is contained in:
Bob
2010-07-30 20:15:14 +12:00
parent 2dd558a065
commit b4c84a11f2
11 changed files with 13 additions and 16 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -13,7 +13,7 @@ using OpenRA.FileFormats;
namespace OpenRA.Graphics
{
static class SpriteSheetBuilder
public static class SpriteSheetBuilder
{
public static void Initialize( TileSet tileset )
{

View File

@@ -17,7 +17,7 @@ using OpenRA.Widgets;
namespace OpenRA.Graphics
{
class Viewport
public class Viewport
{
readonly float2 screenSize;
float2 scrollPosition;

View File

@@ -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>

View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Orders
{
class PlaceBuildingOrderGenerator : IOrderGenerator
public class PlaceBuildingOrderGenerator : IOrderGenerator
{
readonly Actor Producer;
readonly string Building;

View File

@@ -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;

View File

@@ -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)
{

View File

@@ -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">