Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 5054 → Rev 5055

/polymer/eduke32/build/include/hightile.h
86,8 → 86,10
HICTINT_INVERT = 2,
HICTINT_COLORIZE = 4,
HICTINT_USEONART = 8,
HICTINT_APPLYOVERPALSWAP = 16,
HICTINT_APPLYOVERALTPAL = 32,
 
HICEFFECTMASK = (1|2|4|8),
HICEFFECTMASK = (1|2|4|8|16|32),
};
 
#define GRAYSCALE_COEFF_RED 0.3
/polymer/eduke32/build/src/polymost.c
1527,7 → 1527,7
{
if (pth && (pth->flags & PTH_HIGHTILE))
{
if (pth->palnum != globalpal)
if (pth->palnum != globalpal || (hictinting[globalpal].f & HICTINT_APPLYOVERALTPAL))
hictinting_apply(pc, globalpal);
 
if (have_basepal_tint())
/polymer/eduke32/build/src/texcache.c
36,6 → 36,9
const int32_t j = dapicnum&(GLTEXCACHEADSIZ-1);
pthtyp *pth;
 
if ((hictinting[dapalnum].f & HICTINT_USEONART) && !(hictinting[dapalnum].f & HICTINT_APPLYOVERPALSWAP))
dapalnum = 0;
 
// load from art
for (pth=texcache.list[j]; pth; pth=pth->next)
if (pth->picnum == dapicnum && pth->palnum == dapalnum && pth->shade == dashade &&