zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-15 20:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed incorrect 'twodonly' flag set for the base palettes.

Browse source 
This let the palette creator skip all translations for the water and slime palette. Fixes #28.
This commit is contained in:
Christoph Oelckers 2020-07-26 17:56:33 +02:00
parent 07a7cade70
commit 775eabcd3d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1013,11 +1013,11 @@ bool PickTexture(int picnum, FGameTexture* tex, int paletteid, TexturePick& pick
pick.translation = TRANSLATION(usepalette + Translation_Remap, usepalswap); pick.translation = TRANSLATION(usepalette + Translation_Remap, usepalswap);
pick.basepalTint = 0xffffff; pick.basepalTint = 0xffffff;
auto& h = lookups.tables[palette]; auto& h = lookups.tables[usepalswap];
bool applytint = false; bool applytint = false;
// Canvas textures must be treated like hightile replacements in the following code. // Canvas textures must be treated like hightile replacements in the following code.
if (picnum < 0) picnum = TileFiles.GetTileIndex(tex); // Allow getting replacements also when the texture is not passed by its tile number. if (picnum < 0) picnum = TileFiles.GetTileIndex(tex); // Allow getting replacements also when the texture is not passed by its tile number.
auto rep = (picnum >= 0 && hw_hightile && !(h.tintFlags & TINTF_ALWAYSUSEART)) ? TileFiles.FindReplacement(picnum, palette) : nullptr; auto rep = (picnum >= 0 && hw_hightile && !(h.tintFlags & TINTF_ALWAYSUSEART)) ? TileFiles.FindReplacement(picnum, usepalswap) : nullptr;
if (rep || tex->GetTexture()->isHardwareCanvas()) if (rep || tex->GetTexture()->isHardwareCanvas())
{ {
if (usepalette != 0) if (usepalette != 0)
@ -1032,7 +1032,7 @@ bool PickTexture(int picnum, FGameTexture* tex, int paletteid, TexturePick& pick
{ {
tex = rep->faces[0]; tex = rep->faces[0];
} }
if (!rep || rep->palnum != palette || (h.tintFlags & TINTF_APPLYOVERALTPAL)) applytint = true; if (!rep || rep->palnum != usepalswap || (h.tintFlags & TINTF_APPLYOVERALTPAL)) applytint = true;
pick.translation = 0; pick.translation = 0;
} }
else else