zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed incomplete texts in inventory.

Browse source 
This didn't properly discover bad lowercase entries in the font.
This commit is contained in:
Christoph Oelckers 2020-06-26 12:20:24 +02:00
parent 43f899f2ce
commit 16db8195d5
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/core/2d/screentext.cpp
View file

@ -83,6 +83,21 @@ char* G_GetSubString(const char *text, const char *end, const int32_t iter, cons
#define USERQUOTE_RIGHTOFFSET 14 #define USERQUOTE_RIGHTOFFSET 14
static int GetStringTile(int font, const char* t, int f)
{
int ret = gi->GetStringTile(font, t, f);
auto tex = tileGetTexture(ret);
if (!tex || !tex->isValid())
{
if (*t >= 'a' && *t <= 'z')
{
char tt = *t - 32;
ret = gi->GetStringTile(font, &tt, f);
}
}
return ret;
}
// qstrdim // qstrdim
vec2_t G_ScreenTextSize(const int32_t font, vec2_t G_ScreenTextSize(const int32_t font,
@ -171,7 +186,7 @@ vec2_t G_ScreenTextSize(const int32_t font,
} }
// translate the character to a tilenum // translate the character to a tilenum
tile = gi->GetStringTile(font, &t, f); tile = GetStringTile(font, &t, f);
// reset this here because we haven't printed anything yet this loop // reset this here because we haven't printed anything yet this loop
extent.x = 0; extent.x = 0;
@ -192,7 +207,7 @@ vec2_t G_ScreenTextSize(const int32_t font,
char space = '.'; // this is subject to change as an implementation detail char space = '.'; // this is subject to change as an implementation detail
if (f & TEXT_TILESPACE) if (f & TEXT_TILESPACE)
space = '\x7F'; // tile after '~' space = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &space, f); tile = GetStringTile(font, &space, f);
extent.x += (tilesiz[tile].x * z); extent.x += (tilesiz[tile].x * z);
} }
@ -206,7 +221,7 @@ vec2_t G_ScreenTextSize(const int32_t font,
char line = 'A'; // this is subject to change as an implementation detail char line = 'A'; // this is subject to change as an implementation detail
if (f & TEXT_TILELINE) if (f & TEXT_TILELINE)
line = '\x7F'; // tile after '~' line = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &line, f); tile = GetStringTile(font, &line, f);
tempyextent += tilesiz[tile].y * z; tempyextent += tilesiz[tile].y * z;
} }
@ -239,7 +254,7 @@ vec2_t G_ScreenTextSize(const int32_t font,
char line = 'A'; // this is subject to change as an implementation detail char line = 'A'; // this is subject to change as an implementation detail
if (f & TEXT_TILELINE) if (f & TEXT_TILELINE)
line = '\x7F'; // tile after '~' line = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &line, f); tile = GetStringTile(font, &line, f);
tempyextent += tilesiz[tile].y * z; tempyextent += tilesiz[tile].y * z;
} }
@ -267,7 +282,7 @@ vec2_t G_ScreenTextSize(const int32_t font,
if (NUMHACKACTIVE) if (NUMHACKACTIVE)
{ {
char numeral = '0'; // this is subject to change as an implementation detail char numeral = '0'; // this is subject to change as an implementation detail
extent.x = (tilesiz[gi->GetStringTile(font, &numeral, f)].x-1) * z; extent.x = (tilesiz[GetStringTile(font, &numeral, f)].x-1) * z;
} }
// height // height
@ -328,7 +343,7 @@ vec2_t G_ScreenTextSize(const int32_t font,
char line = 'A'; // this is subject to change as an implementation detail char line = 'A'; // this is subject to change as an implementation detail
if (f & TEXT_TILELINE) if (f & TEXT_TILELINE)
line = '\x7F'; // tile after '~' line = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &line, f); tile = GetStringTile(font, &line, f);
tempyextent += tilesiz[tile].y * z; tempyextent += tilesiz[tile].y * z;
} }
@ -559,7 +574,7 @@ vec2_t G_ScreenText(const int32_t font,
} }
// translate the character to a tilenum // translate the character to a tilenum
tile = gi->GetStringTile(font, &t, f); tile = GetStringTile(font, &t, f);
switch (t) switch (t)
{ {
@ -601,7 +616,7 @@ vec2_t G_ScreenText(const int32_t font,
char space = '.'; // this is subject to change as an implementation detail char space = '.'; // this is subject to change as an implementation detail
if (f & TEXT_TILESPACE) if (f & TEXT_TILESPACE)
space = '\x7F'; // tile after '~' space = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &space, f); tile = GetStringTile(font, &space, f);
extent.x += (tilesiz[tile].x * z); extent.x += (tilesiz[tile].x * z);
} }
@ -615,7 +630,7 @@ vec2_t G_ScreenText(const int32_t font,
char line = 'A'; // this is subject to change as an implementation detail char line = 'A'; // this is subject to change as an implementation detail
if (f & TEXT_TILELINE) if (f & TEXT_TILELINE)
line = '\x7F'; // tile after '~' line = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &line, f); tile = GetStringTile(font, &line, f);
tempyextent += tilesiz[tile].y * z; tempyextent += tilesiz[tile].y * z;
} }
@ -643,7 +658,7 @@ vec2_t G_ScreenText(const int32_t font,
char line = 'A'; // this is subject to change as an implementation detail char line = 'A'; // this is subject to change as an implementation detail
if (f & TEXT_TILELINE) if (f & TEXT_TILELINE)
line = '\x7F'; // tile after '~' line = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &line, f); tile = GetStringTile(font, &line, f);
tempyextent += tilesiz[tile].y * z; tempyextent += tilesiz[tile].y * z;
} }
@ -694,7 +709,7 @@ vec2_t G_ScreenText(const int32_t font,
if (NUMHACKACTIVE) if (NUMHACKACTIVE)
{ {
char numeral = '0'; // this is subject to change as an implementation detail char numeral = '0'; // this is subject to change as an implementation detail
extent.x = (tilesiz[gi->GetStringTile(font, &numeral, f)].x-1) * z; extent.x = (tilesiz[GetStringTile(font, &numeral, f)].x-1) * z;
} }
// height // height
@ -752,7 +767,7 @@ vec2_t G_ScreenText(const int32_t font,
char line = 'A'; // this is subject to change as an implementation detail char line = 'A'; // this is subject to change as an implementation detail
if (f & TEXT_TILELINE) if (f & TEXT_TILELINE)
line = '\x7F'; // tile after '~' line = '\x7F'; // tile after '~'
tile = gi->GetStringTile(font, &line, f); tile = GetStringTile(font, &line, f);
tempyextent += tilesiz[tile].y * z; tempyextent += tilesiz[tile].y * z;
} }