From 4bc5ed0e831282090309e58107d53d0dde27aabe Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 9 Jan 2011 22:49:50 +0000 Subject: [PATCH] have gltexcompr option in mapster32; fix prhighpal.py script git-svn-id: https://svn.eduke32.com/eduke32@1755 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/config.c | 7 ++++++- polymer/eduke32/build/src/util/prhighpal.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/build/src/config.c b/polymer/eduke32/build/src/config.c index 692dc8b10..cdaef54f3 100644 --- a/polymer/eduke32/build/src/config.c +++ b/polymer/eduke32/build/src/config.c @@ -178,6 +178,10 @@ int32_t loadsetup(const char *fn) r_downsize = clamp(r_downsize, 0, 5); r_downsizevar = r_downsize; } + if (readconfig(fp, "r_texcompr", val, VL) > 0) + { + glusetexcompr = !!Batoi(val); + } #endif if (readconfig(fp, "gameexecutable", val, VL) > 0) @@ -350,6 +354,7 @@ int32_t writesetup(const char *fn) "gltexfiltermode = %d\n" "glanisotropy = %d\n" "r_downsize = %d\n" + "r_texcompr = %d\n" "\n" #endif @@ -508,7 +513,7 @@ int32_t writesetup(const char *fn) editorgridextent, min(max(0, default_grid), 9), #if defined(POLYMOST) && defined(USE_OPENGL) usemodels, usehightile, - glusetexcache, gltexfiltermode, glanisotropy,r_downsize, + glusetexcache, gltexfiltermode, glanisotropy,r_downsize,glusetexcompr, #endif #ifdef RENDERTYPEWIN maxrefreshfreq, windowpos, windowx, windowy, diff --git a/polymer/eduke32/build/src/util/prhighpal.py b/polymer/eduke32/build/src/util/prhighpal.py index 442f815c4..6947bd8e7 100755 --- a/polymer/eduke32/build/src/util/prhighpal.py +++ b/polymer/eduke32/build/src/util/prhighpal.py @@ -207,7 +207,7 @@ BASEPALHSV should the precomputed HSV representation of BASEPAL." mask = m1 | m2 | m3 | m4; # blue to gray by removing all saturation - h[m1] = 0.0; + s[m1] = 0.0; # orange and brown to blue h[m2] = 0.66; # purple and reddish to blue