X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a3f250949dacbfaf48f306523e1217bcf81a83a9;hb=9073d88279c0b9c5be103a6bb4d5c608ab0d90cc;hp=1289c0b6faca1dd467202d00267ee509aa96824c;hpb=a6f92ff31331edb70bdd380518fe217a78788f7e;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 1289c0b6..a3f25094 100644 --- a/src/main.c +++ b/src/main.c @@ -2988,14 +2988,14 @@ struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] = struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] = { - { ".MAIN", 0, }, - { ".LEVELS", 0, }, - { ".SCORES", 0, }, - { ".EDITOR", 0, }, - { ".INFO", 0, }, - { ".SETUP", 0, }, - { ".DOOR", 0, }, - { ".PREVIEW", 0, }, + { ".MAIN", GAME_MODE_MAIN, }, + { ".LEVELS", GAME_MODE_LEVELS }, + { ".SCORES", GAME_MODE_SCORES, }, + { ".EDITOR", GAME_MODE_EDITOR, }, + { ".INFO", GAME_MODE_INFO, }, + { ".SETUP", GAME_MODE_SETUP, }, + { ".DOOR", GAME_MODE_PSEUDO_DOOR, }, + { ".PREVIEW", GAME_MODE_PSEUDO_PREVIEW, }, { NULL, 0, } }; @@ -3004,6 +3004,9 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] = /* font definitions */ /* ------------------------------------------------------------------------- */ +/* Important: When one entry is a prefix of another entry, the longer entry + must come first, because the dynamic configuration does prefix matching! */ + struct FontInfo font_info[NUM_FONTS + 1] = { { "font.initial_1" }, @@ -3014,13 +3017,17 @@ struct FontInfo font_info[NUM_FONTS + 1] = { "font.title_2" }, { "font.menu_1" }, { "font.menu_2" }, + { "font.text_1.active" }, + { "font.text_2.active" }, + { "font.text_3.active" }, + { "font.text_4.active" }, { "font.text_1" }, { "font.text_2" }, { "font.text_3" }, { "font.text_4" }, { "font.input_1.active" }, - { "font.input_1" }, { "font.input_2.active" }, + { "font.input_1" }, { "font.input_2" }, { "font.option_off" }, { "font.option_on" },