zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 04:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed hires lookup for tiles using special palettes.

Browse source 
In these cases the palette needs to be ignored and the base version picked. The proper handling for this case was undefined, working in some cases and not in others.
Fixes #247
This commit is contained in:
Christoph Oelckers 2021-01-29 11:47:55 +01:00
parent ff0be3079e
commit 52ba0461bc
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/textures/hightile.cpp
View file

@ -314,13 +314,11 @@ int tileSetSkybox(int picnum, int palnum, const char **facenames, int flags )
static bool PickTexture(FGameTexture* tex, int paletteid, TexturePick& pick) static bool PickTexture(FGameTexture* tex, int paletteid, TexturePick& pick)
{ {
if (!tex->isValid() || tex->GetTexelWidth() <= 0 || tex->GetTexelHeight() <= 0) return false; if (!tex->isValid() || tex->GetTexelWidth() <= 0 || tex->GetTexelHeight() <= 0) return false;
if (paletteid == 0)
{
int a = 0;
}
int usepalette = paletteid == 0? 0 : GetTranslationType(paletteid) - Translation_Remap; int usepalette = paletteid == 0? 0 : GetTranslationType(paletteid) - Translation_Remap;
int usepalswap = GetTranslationIndex(paletteid); int usepalswap = GetTranslationIndex(paletteid);
int TextureType = hw_int_useindexedcolortextures? TT_INDEXED : TT_TRUECOLOR; int TextureType = hw_int_useindexedcolortextures? TT_INDEXED : TT_TRUECOLOR;
if (usepalette < 0) usepalette = usepalswap = 0; // this is not a lookup-based translation so ignore it.
pick.translation = paletteid; pick.translation = paletteid;
pick.basepalTint = 0xffffff; pick.basepalTint = 0xffffff;