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

Use screentext in DrawStatNumber

Browse source
This commit is contained in:
nukeykt 2019-10-20 01:01:16 +09:00 committed by Christoph Oelckers
parent 182d5d2eb5
commit 098740155b
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/blood/src/view.cpp
View file

@ -996,8 +996,8 @@ void viewDrawText(int nFont, const char *pString, int x, int y, int nShade, int
break; break;
} }
if (shadow) if (shadow)
G_ScreenText(pFont->tile, x + 1, y + 1, 65536, 0, 0, pString, 127, nPalette, 2|8|16, alpha, 0, 0, pFont->space, 0, nFlags, 0, 0, xdim-1, ydim-1); G_ScreenText(pFont->tile, x + 1, y + 1, 65536, 0, 0, pString, 127, nPalette, 2|8|16|nStat, alpha, 0, 0, pFont->space, 0, nFlags, 0, 0, xdim-1, ydim-1);
G_ScreenText(pFont->tile, x, y, 65536, 0, 0, pString, nShade, nPalette, 2|8|16, alpha, 0, 0, pFont->space, 0, nFlags, 0, 0, xdim-1, ydim-1); G_ScreenText(pFont->tile, x, y, 65536, 0, 0, pString, nShade, nPalette, 2|8|16|nStat, alpha, 0, 0, pFont->space, 0, nFlags, 0, 0, xdim-1, ydim-1);
//if (nFont < 0 || nFont >= 5 || !pString) return; //if (nFont < 0 || nFont >= 5 || !pString) return;
//FONT *pFont = &gFont[nFont]; //FONT *pFont = &gFont[nFont];
// //
@ -1070,14 +1070,15 @@ void DrawStatMaskedSprite(int nTile, int x, int y, int nShade, int nPalette, uns
void DrawStatNumber(const char *pFormat, int nNumber, int nTile, int x, int y, int nShade, int nPalette, unsigned int nStat, int nScale) void DrawStatNumber(const char *pFormat, int nNumber, int nTile, int x, int y, int nShade, int nPalette, unsigned int nStat, int nScale)
{ {
char tempbuf[80]; char tempbuf[80];
int width = tilesiz[nTile].x+1;
x <<= 16;
sprintf(tempbuf, pFormat, nNumber); sprintf(tempbuf, pFormat, nNumber);
for (unsigned int i = 0; i < strlen(tempbuf); i++, x += width*nScale) G_ScreenText(nTile, x<<16, y<<16, nScale, 0, 0, tempbuf, nShade, nPalette, 2|8|ROTATESPRITE_FULL16|nStat, 0, tilesiz[nTile].x * nScale, 0, 1<<16, 0, TEXT_DIGITALNUMBER, 0, 0, xdim-1, ydim-1);
{ //int width = tilesiz[nTile].x+1;
if (tempbuf[i] == ' ') continue; //x <<= 16;
rotatesprite(x, y<<16, nScale, 0, nTile+tempbuf[i]-'0', nShade, nPalette, nStat | 10, 0, 0, xdim-1, ydim-1); //for (unsigned int i = 0; i < strlen(tempbuf); i++, x += width*nScale)
} //{
// if (tempbuf[i] == ' ') continue;
// rotatesprite(x, y<<16, nScale, 0, nTile+tempbuf[i]-'0', nShade, nPalette, nStat | 10, 0, 0, xdim-1, ydim-1);
//}
} }
void TileHGauge(int nTile, int x, int y, int nMult, int nDiv, int nStat, int nScale) void TileHGauge(int nTile, int x, int y, int nMult, int nDiv, int nStat, int nScale)