From 70e6a2d688224b6138bcb7aebd55ef038e1b5875 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 30 Mar 2020 16:34:04 -0700 Subject: [PATCH] Sync missing changes --- NHSE.Core/Structures/Designs/DesignPattern.cs | 8 ++++---- NHSE.Sprites/ImageUtil.cs | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NHSE.Core/Structures/Designs/DesignPattern.cs b/NHSE.Core/Structures/Designs/DesignPattern.cs index 495c472..c71f974 100644 --- a/NHSE.Core/Structures/Designs/DesignPattern.cs +++ b/NHSE.Core/Structures/Designs/DesignPattern.cs @@ -127,11 +127,11 @@ public byte[] GetPaletteBitmap() for (int i = 0; i < PaletteColorCount; i++) { var ofs = PaletteDataStart + (i * 3); - result[i + 2] = Data[ofs + 0]; - result[i + 1] = Data[ofs + 1]; - result[i + 0] = Data[ofs + 2]; + result[(i * 3) + 2] = Data[ofs + 0]; + result[(i * 3) + 1] = Data[ofs + 1]; + result[(i * 3) + 0] = Data[ofs + 2]; } - return Data.Slice(PaletteDataStart, PaletteColorCount * PaletteColorSize); + return result; } } } diff --git a/NHSE.Sprites/ImageUtil.cs b/NHSE.Sprites/ImageUtil.cs index aaf81c7..f9adf3e 100644 --- a/NHSE.Sprites/ImageUtil.cs +++ b/NHSE.Sprites/ImageUtil.cs @@ -12,6 +12,7 @@ public static Bitmap GetImage(this DesignPattern bg) { return GetBitmap(bg.GetBitmap(), DesignPattern.Width, DesignPattern.Height); } + public static Bitmap GetPalette(this DesignPattern bg) { return GetBitmap(bg.GetPaletteBitmap(), DesignPattern.PaletteColorCount, 1, PixelFormat.Format24bppRgb);