diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-02 08:24:50 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-02 08:24:50 +0000 |
| commit | 34f51ccb04e99443cd970248550aa0e902ae298a (patch) | |
| tree | 2c493bc5b4e97a6e112ec57311e891aec77bdaa7 /firmware | |
| parent | 8c8703038be3f9bbb80742816045e18d3aa8c465 (diff) | |
| download | rockbox-34f51ccb04e99443cd970248550aa0e902ae298a.tar.gz rockbox-34f51ccb04e99443cd970248550aa0e902ae298a.zip | |
* Make the user font count more sane
* font 2-9 in the skins will always be user fonts in the skins
* init the skinfonts array so it doesnt think id 'x' is used already
* make the parser work with FONT_UI untill the very end, even on remote fonts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24989 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/font.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/export/font.h b/firmware/export/font.h index 307db6967d..406901d072 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
| @@ -54,9 +54,10 @@ enum { | |||
| 54 | SYSTEMFONTCOUNT, /* Number of fonts reserved for the system and ui */ | 54 | SYSTEMFONTCOUNT, /* Number of fonts reserved for the system and ui */ |
| 55 | FONT_FIRSTUSERFONT = 2 | 55 | FONT_FIRSTUSERFONT = 2 |
| 56 | }; | 56 | }; |
| 57 | #define MAXUSERFONTS 8 | ||
| 57 | 58 | ||
| 58 | /* SYSFONT, FONT_UI, FONT_UI_REMOTE + 8 fonts in skins */ | 59 | /* SYSFONT, FONT_UI, FONT_UI_REMOTE + MAXUSERFONTS fonts in skins */ |
| 59 | #define MAXFONTS 11 | 60 | #define MAXFONTS (SYSTEMFONTCOUNT + MAXUSERFONTS) |
| 60 | 61 | ||
| 61 | /* | 62 | /* |
| 62 | * .fnt loadable font file format definition | 63 | * .fnt loadable font file format definition |