X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_fnt.c;h=404adc6f0b8628ca10672923024398d74f322560;hb=88c9b68c44a16e7df62557b63cc7e86731e028c9;hp=09dbe0076815812b637b1c46b5132f3c6fc41703;hpb=6c244f56b4911dc83930193a43497388b91696af;p=rocksndiamonds.git diff --git a/src/conf_fnt.c b/src/conf_fnt.c index 09dbe007..404adc6f 100644 --- a/src/conf_fnt.c +++ b/src/conf_fnt.c @@ -47,10 +47,6 @@ font_to_graphic[] = FONT_TITLE_1, -1, IMG_FONT_TITLE_1 }, - { - FONT_TITLE_1, GFX_SPECIAL_ARG_LEVELS, - IMG_FONT_TITLE_1_LEVELS - }, { FONT_TITLE_2, -1, IMG_FONT_TITLE_2 @@ -71,13 +67,17 @@ font_to_graphic[] = FONT_TEXT_1, GFX_SPECIAL_ARG_LEVELS, IMG_FONT_TEXT_1_LEVELS }, + { + FONT_TEXT_1, GFX_SPECIAL_ARG_PREVIEW, + IMG_FONT_TEXT_1_PREVIEW + }, { FONT_TEXT_1, GFX_SPECIAL_ARG_SCORES, IMG_FONT_TEXT_1_SCORES }, { - FONT_TEXT_1, GFX_SPECIAL_ARG_PREVIEW, - IMG_FONT_TEXT_1_PREVIEW + FONT_TEXT_1_ACTIVE, GFX_SPECIAL_ARG_SCORES, + IMG_FONT_TEXT_1_ACTIVE_SCORES }, { FONT_TEXT_2, -1, @@ -87,13 +87,17 @@ font_to_graphic[] = FONT_TEXT_2, GFX_SPECIAL_ARG_LEVELS, IMG_FONT_TEXT_2_LEVELS }, + { + FONT_TEXT_2, GFX_SPECIAL_ARG_PREVIEW, + IMG_FONT_TEXT_2_PREVIEW + }, { FONT_TEXT_2, GFX_SPECIAL_ARG_SCORES, IMG_FONT_TEXT_2_SCORES }, { - FONT_TEXT_2, GFX_SPECIAL_ARG_PREVIEW, - IMG_FONT_TEXT_2_PREVIEW + FONT_TEXT_2_ACTIVE, GFX_SPECIAL_ARG_SCORES, + IMG_FONT_TEXT_2_ACTIVE_SCORES }, { FONT_TEXT_3, -1, @@ -103,13 +107,17 @@ font_to_graphic[] = FONT_TEXT_3, GFX_SPECIAL_ARG_LEVELS, IMG_FONT_TEXT_3_LEVELS }, + { + FONT_TEXT_3, GFX_SPECIAL_ARG_PREVIEW, + IMG_FONT_TEXT_3_PREVIEW + }, { FONT_TEXT_3, GFX_SPECIAL_ARG_SCORES, IMG_FONT_TEXT_3_SCORES }, { - FONT_TEXT_3, GFX_SPECIAL_ARG_PREVIEW, - IMG_FONT_TEXT_3_PREVIEW + FONT_TEXT_3_ACTIVE, GFX_SPECIAL_ARG_SCORES, + IMG_FONT_TEXT_3_ACTIVE_SCORES }, { FONT_TEXT_4, -1, @@ -124,24 +132,52 @@ font_to_graphic[] = IMG_FONT_TEXT_4_SCORES }, { - FONT_INPUT, -1, - IMG_FONT_INPUT + FONT_TEXT_4_ACTIVE, GFX_SPECIAL_ARG_SCORES, + IMG_FONT_TEXT_4_ACTIVE_SCORES + }, + { + FONT_ENVELOPE_1, -1, + IMG_FONT_ENVELOPE_1 + }, + { + FONT_ENVELOPE_2, -1, + IMG_FONT_ENVELOPE_2 + }, + { + FONT_ENVELOPE_3, -1, + IMG_FONT_ENVELOPE_3 + }, + { + FONT_ENVELOPE_4, -1, + IMG_FONT_ENVELOPE_4 + }, + { + FONT_INPUT_1, -1, + IMG_FONT_INPUT_1 + }, + { + FONT_INPUT_1, GFX_SPECIAL_ARG_MAIN, + IMG_FONT_INPUT_1_MAIN + }, + { + FONT_INPUT_1_ACTIVE, -1, + IMG_FONT_INPUT_1_ACTIVE }, { - FONT_INPUT, GFX_SPECIAL_ARG_MAIN, - IMG_FONT_INPUT_MAIN + FONT_INPUT_1_ACTIVE, GFX_SPECIAL_ARG_MAIN, + IMG_FONT_INPUT_1_ACTIVE_MAIN }, { - FONT_INPUT_ACTIVE, -1, - IMG_FONT_INPUT_ACTIVE + FONT_INPUT_1_ACTIVE, GFX_SPECIAL_ARG_SETUP, + IMG_FONT_INPUT_1_ACTIVE_SETUP }, { - FONT_INPUT_ACTIVE, GFX_SPECIAL_ARG_MAIN, - IMG_FONT_INPUT_ACTIVE_MAIN + FONT_INPUT_2, -1, + IMG_FONT_INPUT_2 }, { - FONT_INPUT_ACTIVE, GFX_SPECIAL_ARG_SETUP, - IMG_FONT_INPUT_ACTIVE_SETUP + FONT_INPUT_2_ACTIVE, -1, + IMG_FONT_INPUT_2_ACTIVE }, { FONT_OPTION_OFF, -1,