diff --git a/Graphics/font/smallfont/+error.bmp b/Graphics/font/smallfont/+error.bmp new file mode 100644 index 000000000..4eaab3ae4 Binary files /dev/null and b/Graphics/font/smallfont/+error.bmp differ diff --git a/makefile.gfx b/makefile.gfx index 7606c2d7a..97708b92b 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -233,7 +233,8 @@ UI_GFX_FONT := smallfont/+33 smallfont/+34 smallfont/+37 smallfont/+39 smallf smallfont/+230 smallfont/+232 smallfont/+233 smallfont/+234 smallfont/+235 \ smallfont/+236 smallfont/+237 smallfont/+238 smallfont/+239 smallfont/+242 \ smallfont/+243 smallfont/+244 smallfont/+245 smallfont/+246 smallfont/+249 \ - smallfont/+250 smallfont/+251 smallfont/+252 smallfont/+253 smallfont/+255 + smallfont/+250 smallfont/+251 smallfont/+252 smallfont/+253 smallfont/+255 \ + smallfont/+error UI_GFX_FONT_IN := $(foreach FILE,$(UI_GFX_FONT),$(UI_FONT_DIR)/$(FILE).bmp) UI_GFX_NONTRANS := diff --git a/source/gfx/fdata.cpp b/source/gfx/fdata.cpp index 6155946b2..2ff0c28e2 100644 --- a/source/gfx/fdata.cpp +++ b/source/gfx/fdata.cpp @@ -52,7 +52,7 @@ s16 standardFontTab[]= { - -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , + -1 ,FRM__ERROR,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , @@ -76,7 +76,6 @@ s16 standardFontTab[]= /* ¨ © ª « ¬ ­ ® ¯ */ -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , /* ° ± ² ³ ´ µ ¶ · */ -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , /* ¸ ¹ º » ¼ ½ ¾ ¿ */ -1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 , -// (pkg) ? -1,-1, /* À Á Â Ã Ä Å Æ Ç */ FRM__192,FRM__193,FRM__194,FRM__195,FRM__196,FRM__197,FRM__198,FRM__199, /* È É Ê Ë Ì Í Î Ï */ FRM__200,FRM__201,FRM__202,FRM__203,FRM__204,FRM__205,FRM__206,FRM__207, /* Ð Ñ Ò Ó Ô Õ Ö × */ FRM__208, -1,FRM__210,FRM__211,FRM__212,FRM__213,FRM__214, -1, diff --git a/source/gfx/font.cpp b/source/gfx/font.cpp index 3652c82e7..a40e0046a 100644 --- a/source/gfx/font.cpp +++ b/source/gfx/font.cpp @@ -268,7 +268,7 @@ int FontBank::getCharWidth( char _char ) if( _char!=' ' ) { - if( m_fontData->fontTab[_char]==-1 ) _char='X'; + if( m_fontData->fontTab[_char]==-1 ) _char=1; // Error - Chartacter does not eixst! size=m_spriteBank.getFrameWidth( m_fontData->fontTab[_char] ); } else @@ -347,7 +347,7 @@ int FontBank::printChar( char _char,int _x,int _y ) { if (_char!=' ') { - if( m_fontData->fontTab[_char]==-1 ) _char='X'; + if( m_fontData->fontTab[_char]==-1 ) _char=1; // Error - Chartacter does not eixst! POLY_FT4 *Ft4=m_spriteBank.printFT4(m_fontData->fontTab[_char],_x,_y,0,0,m_ot); setRGB0(Ft4,m_r,m_g,m_b); setShadeTex(Ft4,0); @@ -440,7 +440,7 @@ int ScalableFontBank::printChar( char _char,int _x,int _y ) sFrameHdr *fh; POLY_FT4 *Ft4; - if( m_fontData->fontTab[_char]==-1 ) _char='X'; + if( m_fontData->fontTab[_char]==-1 ) _char=1; // Error - Chartacter does not eixst! fh=m_spriteBank.getFrameHeader(m_fontData->fontTab[_char]); _x+=((fh->W*m_fontScale)>>9)-(fh->W/2);