epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardise Theater -> Tileset.

Browse Source
This commit is contained in:
Paul Chote
2010-11-24 10:09:51 +13:00
parent 8b0255e2f7
commit 00dc91cf49
17 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -276,7 +276,6 @@
<Compile Include="ReplaceWithActor.cs" />
<Compile Include="OreRefineryDockAction.cs" />
<Compile Include="StoresOre.cs" />
<Compile Include="PaletteFromCurrentTheatre.cs" />
<Compile Include="Widgets\Delegates\OrderButtonsChromeDelegate.cs" />
<Compile Include="RadarColorFromTerrain.cs" />
<Compile Include="EngineerRepair.cs" />
@@ -312,6 +311,7 @@
<Compile Include="ServerTraits\PlayerCommands.cs" />
<Compile Include="ServerTraits\LobbyCommands.cs" />
<Compile Include="Scripting\RASpecialPowers.cs" />
<Compile Include="PaletteFromCurrentTileset.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

10
OpenRA.Mods.RA/PaletteFromCurrentTheatre.cs → OpenRA.Mods.RA/PaletteFromCurrentTileset.cs
View File

@@ -13,20 +13,20 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class PaletteFromCurrentTheatreInfo : ITraitInfo
class PaletteFromCurrentTilesetInfo : ITraitInfo
{
public readonly string Name = null;
public readonly bool Transparent = true;
public object Create(ActorInitializer init) { return new PaletteFromCurrentTheatre(init.world, this); }
public object Create(ActorInitializer init) { return new PaletteFromCurrentTileset(init.world, this); }
}
class PaletteFromCurrentTheatre : IPalette
class PaletteFromCurrentTileset : IPalette
{
readonly World world;
readonly PaletteFromCurrentTheatreInfo info;
readonly PaletteFromCurrentTilesetInfo info;
public PaletteFromCurrentTheatre(World world, PaletteFromCurrentTheatreInfo info)
public PaletteFromCurrentTileset(World world, PaletteFromCurrentTilesetInfo info)
{
this.world = world;
this.info = info;

4
OpenRA.Mods.RA/PaletteFromFile.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA
class PaletteFromFileInfo : ITraitInfo
{
public readonly string Name = null;
public readonly string Theater = null;
public readonly string Tileset = null;
public readonly string Filename = null;
public readonly bool Transparent = true;
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA
public void InitPalette( WorldRenderer wr )
{
if( info.Theater == null || info.Theater.ToLowerInvariant() == world.Map.Theater.ToLowerInvariant() )
if( info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant() )
wr.AddPalette( info.Name, new Palette( FileSystem.Open( info.Filename ), info.Transparent ) );
}
}

4
OpenRA.Mods.RA/PaletteFromRGBA.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA
class PaletteFromRGBAInfo : ITraitInfo
{
public readonly string Name = null;
public readonly string Theatre = null;
public readonly string Tileset = null;
public readonly int R = 0;
public readonly int G = 0;
public readonly int B = 0;
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA
public void InitPalette( WorldRenderer wr )
{
if (info.Theatre == null || info.Theatre.ToLowerInvariant() == world.Map.Theater.ToLowerInvariant())
if (info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant())
{
// TODO: This shouldn't rely on a base palette
var pal = wr.GetPalette("terrain");