From 2ff6826b8e6c5c3d8aec130aed5ad4cdce0565d4 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Tue, 26 Jan 2021 20:54:59 +0000 Subject: [PATCH] Crash fix when using LOBOT: We never actually set the paletteTable->pForcedPalette, so it was doing some weird stuff when it got used. The flash white code sets the pSoldier's forced palette, so now it works as it should (by Asdow) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8922 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/renderworld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index 48d453c0..a2297f6e 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -955,7 +955,7 @@ inline UINT16 * GetShadeTable(LEVELNODE * pNode, SOLDIERTYPE * pSoldier, SOLDIER { if (pSoldier->flags.fForceShade) { - pShadeTable = pPaletteTable->pForcedShade; + pShadeTable = pSoldier->pForcedShade; } } // check if we are a merc duplicate, if so, only do minimal stuff!