From 7cbed30dc6521ef98bbab8d1d8570f7506053ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 18 Jun 2012 17:40:22 +0200 Subject: [PATCH] fix cnc palette issues cursor not supporting transparency; wrong icon, fx palette --- OpenRA.Game/Graphics/CursorProvider.cs | 7 ++++++- mods/cnc/rules/system.yaml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Graphics/CursorProvider.cs b/OpenRA.Game/Graphics/CursorProvider.cs index d60f706dcf..5d7fe88079 100644 --- a/OpenRA.Game/Graphics/CursorProvider.cs +++ b/OpenRA.Game/Graphics/CursorProvider.cs @@ -25,9 +25,14 @@ namespace OpenRA.Graphics { cursors = new Dictionary(); var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal)); + var transparent = false; + var currentMod = Mod.AllMods[Game.modData.Manifest.Mods[0]]; + + if (currentMod.Id == "d2k") + transparent = true; foreach (var s in sequences.NodesDict["Palettes"].Nodes) - Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), true)); + Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), transparent)); foreach (var s in sequences.NodesDict["Cursors"].Nodes) LoadSequencesForCursor(s.Key, s.Value); diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml index 45ce795c21..38d0b79717 100644 --- a/mods/cnc/rules/system.yaml +++ b/mods/cnc/rules/system.yaml @@ -74,10 +74,10 @@ World: Name: staticterrain PaletteFromFile@chrome: Name: chrome - Filename: temperat.pal + Filename: cursor.pal PaletteFromFile@effect: Name: effect - Filename: temperat.pal + Filename: cursor.pal PaletteFromRGBA@shadow: Name: shadow R: 0