Use more constants

This commit is contained in:
Michael Steenbeek 2018-07-20 15:08:25 +02:00
parent 6c66130c73
commit b2873d2f86
2 changed files with 5 additions and 5 deletions

View File

@ -18,7 +18,7 @@
static constexpr const int32_t SpriteFontLineHeight[] = { 6, 10, 10, 18 }; static constexpr const int32_t SpriteFontLineHeight[] = { 6, 10, 10, 18 };
static uint8_t _spriteFontCharacterWidths[896]; static uint8_t _spriteFontCharacterWidths[FONT_SIZE_COUNT * FONT_SPRITE_GLYPH_COUNT];
#ifndef NO_TTF #ifndef NO_TTF
TTFFontSetDescriptor *gCurrentTTFFontSet; TTFFontSetDescriptor *gCurrentTTFFontSet;

View File

@ -25,10 +25,10 @@ enum {
FONT_SPRITE_BASE_MEDIUM_EXTRA_DARK = -2, FONT_SPRITE_BASE_MEDIUM_EXTRA_DARK = -2,
FONT_SPRITE_BASE_MEDIUM_DARK = -1, FONT_SPRITE_BASE_MEDIUM_DARK = -1,
FONT_SPRITE_BASE_TINY = 448, FONT_SPRITE_BASE_TINY = FONT_SIZE_TINY * FONT_SPRITE_GLYPH_COUNT,
FONT_SPRITE_BASE_SMALL = 0, FONT_SPRITE_BASE_SMALL = FONT_SIZE_SMALL * FONT_SPRITE_GLYPH_COUNT,
FONT_SPRITE_BASE_MEDIUM = 224, FONT_SPRITE_BASE_MEDIUM = FONT_SIZE_MEDIUM * FONT_SPRITE_GLYPH_COUNT,
FONT_SPRITE_BASE_BIG = 672 FONT_SPRITE_BASE_BIG = FONT_SIZE_BIG * FONT_SPRITE_GLYPH_COUNT
}; };
#ifndef NO_TTF #ifndef NO_TTF