cpp/openttd-patchpack/source Changeset - r12181:5975dcc8641f

Changeset - r12181:5975dcc8641f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

alberth - 15 years ago 2009-06-20 15:05:59
alberth@openttd.org

(svn r16604) -Codechange: Use FS_BEGIN for iterating over fonts.

2 files changed with 8 insertions and 7 deletions:

src/fontcache.cpp

src/gfx_type.h

0 comments (0 inline, 0 general)

src/fontcache.cpp

➞

Show inline comments

@@ @@ -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, uint @@
 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;

src/gfx_type.h

➞

Show inline comments

@@ @@ -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);

0 comments (0 inline, 0 general)