zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: in drawspritelabel(), use fixed background color.

Browse source 
Make it always one of the colors that the 2D color cycles to
(base color + offset in [0 .. 4]) instead of <base color>-3, as
that one might be in a different color ramp.

git-svn-id: https://svn.eduke32.com/eduke32@5434 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-11-20 20:26:52 +00:00
parent 6123d0b904
commit 6e9203ea23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
polymer/eduke32/build/src/build.c
View file

@ -3289,23 +3289,24 @@ static void drawspritelabel(int i)
if (!dabuffer[0]) if (!dabuffer[0])
return; return;
// int const blocking = (sprite[i].cstat & 1);
// KEEPINSYNC drawscreen_drawsprite() // KEEPINSYNC drawscreen_drawsprite()
uint8_t const spritecol = spritecol2d[sprite[i].picnum][0]; uint8_t const spritecol = spritecol2d[sprite[i].picnum][0];
uint8_t const blockingSpriteCol = spritecol2d[sprite[i].picnum][1]; uint8_t const blockingSpriteCol = spritecol2d[sprite[i].picnum][1];
int col = spritecol ? editorcolors[(sprite[i].cstat&1) ? blockingSpriteCol : spritecol] : int col = spritecol ? editorcolors[(sprite[i].cstat&1) ? blockingSpriteCol : spritecol] :
getspritecol(i); getspritecol(i);
int bgcol = col;
if (show2dsprite[i>>3]&pow2char[i&7]) if (show2dsprite[i>>3]&pow2char[i&7])
col = editorcolors[14] - (M32_THROB>>1); {
bgcol = editorcolors[14];
col = bgcol - (M32_THROB>>1);
}
else if (i == pointhighlight - 16384) else if (i == pointhighlight - 16384)
col += M32_THROB>>2; col += M32_THROB>>2;
else if (sprite[i].sectnum < 0) else if (sprite[i].sectnum < 0)
col = editorcolors[4]; // red col = bgcol = editorcolors[4]; // red
drawsmallabel(dabuffer, editorcolors[0], col, /*blocking ? editorcolors[5] :*/ col - 3, drawsmallabel(dabuffer, editorcolors[0], col, bgcol, sprite[i].x, sprite[i].y, sprite[i].z);
sprite[i].x, sprite[i].y, sprite[i].z);
} }
#define EDITING_MAP_P() (newnumwalls>=0 || joinsector[0]>=0 || circlewall>=0 || (bstatus&1) || isc.active) #define EDITING_MAP_P() (newnumwalls>=0 || joinsector[0]>=0 || circlewall>=0 || (bstatus&1) || isc.active)