diff options
| author | alberth <alberth@openttd.org> | 2009-06-20 15:05:59 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2009-06-20 15:05:59 +0000 |
| commit | 8aa51823fca66887f21533e0de292faf6c907496 (patch) | |
| tree | 19f87218810a7d6811cfca2556ba745ba6b6bf20 | |
| parent | 4419366f94f75032b53362e2722b6476beb02866 (diff) | |
| download | openttd-8aa51823fca66887f21533e0de292faf6c907496.tar.xz | |
(svn r16604) -Codechange: Use FS_BEGIN for iterating over fonts.
| -rw-r--r-- | src/fontcache.cpp | 7 | ||||
| -rw-r--r-- | src/gfx_type.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 2b9854b9d..e59104ac6 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -631,14 +631,13 @@ static GlyphEntry **_glyph_ptr[FS_END]; /** Clear the complete cache */ static void ResetGlyphCache() { - for (int i = 0; i < FS_END; i++) { + for (FontSize i = FS_BEGIN; i < FS_END; i++) { if (_glyph_ptr[i] == NULL) continue; for (int j = 0; j < 256; j++) { if (_glyph_ptr[i][j] == NULL) continue; for (int k = 0; k < 256; k++) { - if (_glyph_ptr[i][j][k].sprite == NULL) continue; free(_glyph_ptr[i][j][k].sprite); } @@ -842,11 +841,11 @@ void SetUnicodeGlyph(FontSize size, uint32 key, SpriteID sprite) void InitializeUnicodeGlyphMap() { - for (FontSize size = FS_NORMAL; size != FS_END; size++) { + for (FontSize size = FS_BEGIN; size != FS_END; size++) { /* Clear out existing glyph map if it exists */ if (_unicode_glyph_map[size] != NULL) { for (uint i = 0; i < 256; i++) { - if (_unicode_glyph_map[size][i] != NULL) free(_unicode_glyph_map[size][i]); + free(_unicode_glyph_map[size][i]); } free(_unicode_glyph_map[size]); _unicode_glyph_map[size] = NULL; diff --git a/src/gfx_type.h b/src/gfx_type.h index 8cae5c0d4..569c78214 100644 --- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -148,10 +148,12 @@ struct Colour { /** Available font sizes */ enum FontSize { - FS_NORMAL, - FS_SMALL, - FS_LARGE, + FS_NORMAL, ///< Index of the normal font in the font tables. + FS_SMALL, ///< Index of the small font in the font tables. + FS_LARGE, ///< Index of the large font in the font tables. FS_END, + + FS_BEGIN = FS_NORMAL, ///< First font. }; DECLARE_POSTFIX_INCREMENT(FontSize); |