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

swap args to PlayerColorRemap

Browse Source
This commit is contained in:
Chris Forbes
2011-10-21 22:11:40 +13:00
parent 4a30019536
commit 4c26710ccb
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Editor/Surface.cs
View File

@@ -306,7 +306,7 @@ namespace OpenRA.Editor
{ {
var pr = Map.Players[name]; var pr = Map.Players[name];
var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>(); var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
var remap = new PlayerColorRemap(pr.ColorRamp, pcpi.PaletteFormat); var remap = new PlayerColorRemap(pcpi.PaletteFormat, pr.ColorRamp);
return new Palette(Palette, remap).AsSystemPalette(); return new Palette(Palette, remap).AsSystemPalette();
} }

2
OpenRA.FileFormats/PlayerColorRemap.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.FileFormats
{ {
Dictionary<int, Color> remapColors; Dictionary<int, Color> remapColors;
public PlayerColorRemap(ColorRamp c, PaletteFormat fmt) public PlayerColorRemap(PaletteFormat fmt, ColorRamp c)
{ {
var c1 = c.GetColor(0); var c1 = c.GetColor(0);
var c2 = c.GetColor(1); /* temptemp: this can be expressed better */ var c2 = c.GetColor(1); /* temptemp: this can be expressed better */

2
OpenRA.Game/Traits/World/PlayerColorPalette.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Traits
{ {
var paletteName = "{0}{1}".F( info.BaseName, owner.InternalName ); var paletteName = "{0}{1}".F( info.BaseName, owner.InternalName );
var newpal = new Palette(wr.GetPalette(info.BasePalette), var newpal = new Palette(wr.GetPalette(info.BasePalette),
new PlayerColorRemap(owner.ColorRamp, info.PaletteFormat)); new PlayerColorRemap(info.PaletteFormat, owner.ColorRamp));
wr.AddPalette(paletteName, newpal); wr.AddPalette(paletteName, newpal);
} }
} }

2
OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA
public void AdjustPalette(Dictionary<string, Palette> palettes) public void AdjustPalette(Dictionary<string, Palette> palettes)
{ {
palettes["colorpicker"] = new Palette(palettes["colorpicker"], palettes["colorpicker"] = new Palette(palettes["colorpicker"],
new PlayerColorRemap(Ramp, format)); new PlayerColorRemap(format, Ramp));
} }
} }
} }