From be0242e919c7c8f7099e1ea5384e9ddc953b4a2d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 25 Jan 2020 19:10:05 +0100 Subject: [PATCH] - use correct indices for the palette tester CVARs. --- source/glbackend/gl_texture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/glbackend/gl_texture.cpp b/source/glbackend/gl_texture.cpp index b2fa7a6e1..4a5c079ea 100644 --- a/source/glbackend/gl_texture.cpp +++ b/source/glbackend/gl_texture.cpp @@ -43,8 +43,8 @@ #include "../../glbackend/glbackend.h" // Test CVARs. -CVAR(Int, fixpalette, 0, 0) -CVAR(Int, fixpalswap, 0, 0) +CVAR(Int, fixpalette, -1, 0) +CVAR(Int, fixpalswap, -1, 0) template void FlipNonSquareBlock(T* dst, const T* src, int x, int y, int srcpitch) @@ -153,8 +153,8 @@ FHardwareTexture* GLInstance::LoadTexture(FTexture* tex, int textype, int palid) bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int method, int sampleroverride, FTexture *det, float detscale, FTexture *glow) { if (tex->GetWidth() <= 0 || tex->GetHeight() <= 0) return false; - int usepalette = fixpalette >= 1 ? fixpalette - 1 : curbasepal; - int usepalswap = fixpalswap >= 1 ? fixpalswap - 1 : palette; + int usepalette = fixpalette >= 0 ? fixpalette : curbasepal; + int usepalswap = fixpalswap >= 0 ? fixpalswap : palette; GLInterface.SetPalette(usepalette); GLInterface.SetPalswap(usepalswap); bool texbound[3] = {};