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

fix cnc cursors

Browse Source
This commit is contained in:
Chris Forbes
2010-03-07 23:26:50 +13:00
parent 34495cf3e7
commit cbd12f90ae
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.FileFormats/Palette.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.FileFormats
return colors[index]; return colors[index];
} }
public Palette(Stream s) public Palette(Stream s, bool remapTransparent)
{ {
using (BinaryReader reader = new BinaryReader(s)) using (BinaryReader reader = new BinaryReader(s))
{ {
@@ -46,9 +46,14 @@ namespace OpenRA.FileFormats
colors.Add(Color.FromArgb(r, g, b)); colors.Add(Color.FromArgb(r, g, b));
} }
} }
colors[0] = Color.FromArgb(0, 0, 0, 0); colors[0] = Color.FromArgb(0, 0, 0, 0);
colors[3] = Color.FromArgb(178, 0, 0, 0);
colors[4] = Color.FromArgb(140, 0, 0, 0); if (remapTransparent)
{
colors[3] = Color.FromArgb(178, 0, 0, 0);
colors[4] = Color.FromArgb(140, 0, 0, 0);
}
} }
public Palette(Palette p, IPaletteRemap r) public Palette(Palette p, IPaletteRemap r)

5
OpenRA.Game/Traits/World/PaletteFromFile.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA.Traits
public readonly string Name = null; public readonly string Name = null;
public readonly string Theater = null; public readonly string Theater = null;
public readonly string Filename = null; public readonly string Filename = null;
public readonly bool Transparent = true;
public object Create(Actor self) { return new PaletteFromFile(self, this); } public object Create(Actor self) { return new PaletteFromFile(self, this); }
} }
@@ -37,8 +38,8 @@ namespace OpenRA.Traits
if (info.Theater == null || if (info.Theater == null ||
info.Theater.ToLowerInvariant() == self.World.Map.Theater.ToLowerInvariant()) info.Theater.ToLowerInvariant() == self.World.Map.Theater.ToLowerInvariant())
{ {
//Log.Write("Loading palette {0} from file {1}", info.Name, info.Filename); self.World.WorldRenderer.AddPalette(info.Name,
self.World.WorldRenderer.AddPalette(info.Name, new Palette(FileSystem.Open(info.Filename))); new Palette(FileSystem.Open(info.Filename), info.Transparent));
} }
} }
} }

2
SequenceEditor/Program.cs
View File

@@ -105,7 +105,7 @@ namespace SequenceEditor
Doc = new XmlDocument(); Doc = new XmlDocument();
Doc.Load(XmlFilename); Doc.Load(XmlFilename);
var tempPal = new Palette(FileSystem.Open(args[2])); var tempPal = new Palette(FileSystem.Open(args[2]), true);
Pal = tempPal; Pal = tempPal;
UnitName = GetTextForm.GetString("Unit to edit?", "e1"); UnitName = GetTextForm.GetString("Unit to edit?", "e1");

BIN
mods/cnc/mouse2.shp Normal file
View File

Binary file not shown.

2
mods/cnc/sequences.xml
View File

@@ -4,7 +4,7 @@
<unit name="clock"> <unit name="clock">
<sequence name="idle" start="0" length="*" src="hclock" /> <sequence name="idle" start="0" length="*" src="hclock" />
</unit> </unit>
<cursor src="mouse"> <cursor src="mouse2">
<sequence name="default" start="0" /> <sequence name="default" start="0" />
<sequence name="scroll" start="1" length="8" /> <sequence name="scroll" start="1" length="8" />
<sequence name="generic-blocked" start="9" /> <sequence name="generic-blocked" start="9" />

1
mods/cnc/system.yaml
View File

@@ -152,6 +152,7 @@ World:
PaletteFromFile@cursor: PaletteFromFile@cursor:
Name: cursor Name: cursor
Filename: temperat.pal Filename: temperat.pal
Transparent: no
PaletteFromRGBA@shadow: PaletteFromRGBA@shadow:
Name: shadow Name: shadow
R: 0 R: 0