From 227a7a61eba5e7a46b3e01af42ce5f2d89d70e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Mar 2013 15:16:49 +0100 Subject: [PATCH] don't crash when trying to get the game assets on first start wr is null at that stage --- OpenRA.Game/Graphics/Viewport.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index 4a15d081ac..48b41a3c0e 100755 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -131,9 +131,13 @@ namespace OpenRA.Graphics var cursorSequence = CursorProvider.GetCursorSequence(cursorName); var cursorSprite = cursorSequence.GetSprite((int)cursorFrame); + var palette = new HardwarePalette(); + foreach (var p in CursorProvider.Palettes) + palette.AddPalette(p.Key, p.Value, false); + renderer.SpriteRenderer.DrawSprite(cursorSprite, Viewport.LastMousePos - cursorSequence.Hotspot, - wr.Palette(cursorSequence.Palette).Index, + palette.GetPaletteIndex(cursorSequence.Palette), cursorSprite.size); }