zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: FSinglePicFont should set the character size by the scaled size of the texture.

Browse source 
SVN r2189 (trunk)
This commit is contained in:
Randy Heit 2010-03-05 03:31:20 +00:00
parent 758327f4b3
commit fad9f251ec
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/v_font.cpp
View file

@ -1352,8 +1352,8 @@ FSinglePicFont::FSinglePicFont(const char *picname)
FTexture *pic = TexMan[picnum];
Name = copystring(picname);
FontHeight = pic->GetHeight();
SpaceWidth = pic->GetWidth();
FontHeight = pic->GetScaledHeight();
SpaceWidth = pic->GetScaledWidth();
GlobalKerning = 0;
FirstChar = LastChar = 'A';
ActiveColors = 0;

4
src/v_text.cpp
View file

@ -324,7 +324,7 @@ FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string)
i = w = 0;
while ( (c = *string++) && i < 128 )
while ( (c = *string++) && i < countof(lines) )
{
if (c == TEXTCOLOR_ESCAPE)
{
@ -400,7 +400,7 @@ FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string)
}
// String here is pointing one character after the '\0'
if (i < 128 && --string - start >= 1)
if (i < countof(lines) && --string - start >= 1)
{
const BYTE *s = start;