ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Cxbx-Reloaded/master'

This commit is contained in:
PatrickvL 2017-02-09 13:26:22 +01:00
parent 843400b54f 1dd154b648
commit ab487cd788
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -138,7 +138,7 @@ static DWORD g_dwVertexShaderUsage = 0;
static DWORD g_VertexShaderSlots[136];
// cached palette pointer
static PVOID pCurrentPalette;
static PVOID pCurrentPalette = nullptr;
// cached palette size
static DWORD dwCurrentPaletteSize = -1;
@ -4808,8 +4808,15 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
{
// Read P8 pixel :
unsigned char p = (unsigned char)pPixelData[w++];
// Read the corresponding ARGB from the palette and store it in the new texture :
pExpandedTexture[y] = pTexturePalette[p];
// HACK: Prevent crash if a pallete has not been loaded yet
if (pTexturePalette != nullptr) {
pExpandedTexture[y] = pTexturePalette[p];
} else {
pExpandedTexture[y] = 0;
}
// are we at the end of a line?
if(++x == dwMipWidth)
{