mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25476) -Cleanup: Remove unused _max_char_size, _max_char_height, _max_char_width.

release/1.4
frosch 2013-06-26 18:49:53 +00:00
parent fc5335111d
commit eb7962a72e
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gfx.cpp
View File

@ -44,9 +44,6 @@ SwitchMode _switch_mode; ///< The next mainloop command.
PauseModeByte _pause_mode; PauseModeByte _pause_mode;
Palette _cur_palette; Palette _cur_palette;
static Dimension _max_char_size[FS_END]; ///< Cache of the maximum size of any character of a font.
static int _max_char_height; ///< Cache of the height of the largest font
static int _max_char_width; ///< Cache of the width of the largest font
static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth() static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()
DrawPixelInfo *_cur_dpi; DrawPixelInfo *_cur_dpi;
byte _colour_gradient[COLOUR_END][8]; byte _colour_gradient[COLOUR_END][8];
@ -1158,23 +1155,9 @@ TextColour GetContrastColour(uint8 background)
void LoadStringWidthTable(bool monospace) void LoadStringWidthTable(bool monospace)
{ {
for (FontSize fs = monospace ? FS_MONO : FS_BEGIN; fs < (monospace ? FS_END : FS_MONO); fs++) { for (FontSize fs = monospace ? FS_MONO : FS_BEGIN; fs < (monospace ? FS_END : FS_MONO); fs++) {
_max_char_size[fs].width = 0;
_max_char_size[fs].height = GetCharacterHeight(fs);
for (uint i = 0; i != 224; i++) { for (uint i = 0; i != 224; i++) {
_stringwidth_table[fs][i] = GetGlyphWidth(fs, i + 32); _stringwidth_table[fs][i] = GetGlyphWidth(fs, i + 32);
_max_char_size[fs].width = max<int>(_max_char_size[fs].width, _stringwidth_table[fs][i]);
} }
/* Needed because they need to be 1 more than the widest. */
_max_char_size[fs].width++;
_max_char_size[fs].height++;
}
_max_char_width = 0;
_max_char_height = 0;
for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
_max_char_width = max<int>(_max_char_width, _max_char_size[fs].width);
_max_char_height = max<int>(_max_char_height, _max_char_size[fs].height);
} }
ReInitAllWindows(); ReInitAllWindows();