Merge branch 'master' into releases

[rocksndiamonds.git] / src / conf_fnt.c

diff --git a/src/conf_fnt.c b/src/conf_fnt.c
index 35d60b91022d085bd402345eb657b15942704dd5..c0ba77e61cbb05d01198dc8d0d3b013904b1e5e8 100644 (file)
--- a/src/conf_fnt.c
+++ b/src/conf_fnt.c
@@ -51,6 +51,10 @@ font_to_graphic[] =
     FONT_TITLE_2,                              -1,
     IMG_FONT_TITLE_2
   },
+  {
+    FONT_TITLE_2,                              GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_TITLE_2_SETUP
+  },
   {
     FONT_MENU_1,                               -1,
     IMG_FONT_MENU_1
@@ -71,10 +75,22 @@ font_to_graphic[] =
     FONT_TEXT_1,                               -1,
     IMG_FONT_TEXT_1
   },
+  {
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_MAIN,
+    IMG_FONT_TEXT_1_MAIN
+  },
   {
     FONT_TEXT_1,                               GFX_SPECIAL_ARG_LEVELS,
     IMG_FONT_TEXT_1_LEVELS
   },
+  {
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_LEVELNR,
+    IMG_FONT_TEXT_1_LEVELNR
+  },
+  {
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_TEXT_1_SETUP
+  },
   {
     FONT_TEXT_1,                               GFX_SPECIAL_ARG_PREVIEW,
     IMG_FONT_TEXT_1_PREVIEW
@@ -87,14 +103,34 @@ font_to_graphic[] =
     FONT_TEXT_1_ACTIVE,                                GFX_SPECIAL_ARG_SCORES,
     IMG_FONT_TEXT_1_ACTIVE_SCORES
   },
+  {
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_PANEL,
+    IMG_FONT_TEXT_1_PANEL
+  },
+  {
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_DOOR,
+    IMG_FONT_TEXT_1_DOOR
+  },
   {
     FONT_TEXT_2,                               -1,
     IMG_FONT_TEXT_2
   },
+  {
+    FONT_TEXT_2,                               GFX_SPECIAL_ARG_MAIN,
+    IMG_FONT_TEXT_2_MAIN
+  },
   {
     FONT_TEXT_2,                               GFX_SPECIAL_ARG_LEVELS,
     IMG_FONT_TEXT_2_LEVELS
   },
+  {
+    FONT_TEXT_2,                               GFX_SPECIAL_ARG_LEVELNR,
+    IMG_FONT_TEXT_2_LEVELNR
+  },
+  {
+    FONT_TEXT_2,                               GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_TEXT_2_SETUP
+  },
   {
     FONT_TEXT_2,                               GFX_SPECIAL_ARG_PREVIEW,
     IMG_FONT_TEXT_2_PREVIEW
@@ -115,6 +151,14 @@ font_to_graphic[] =
     FONT_TEXT_3,                               GFX_SPECIAL_ARG_LEVELS,
     IMG_FONT_TEXT_3_LEVELS
   },
+  {
+    FONT_TEXT_3,                               GFX_SPECIAL_ARG_LEVELNR,
+    IMG_FONT_TEXT_3_LEVELNR
+  },
+  {
+    FONT_TEXT_3,                               GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_TEXT_3_SETUP
+  },
   {
     FONT_TEXT_3,                               GFX_SPECIAL_ARG_PREVIEW,
     IMG_FONT_TEXT_3_PREVIEW
@@ -131,10 +175,22 @@ font_to_graphic[] =
     FONT_TEXT_4,                               -1,
     IMG_FONT_TEXT_4
   },
+  {
+    FONT_TEXT_4,                               GFX_SPECIAL_ARG_MAIN,
+    IMG_FONT_TEXT_4_MAIN
+  },
   {
     FONT_TEXT_4,                               GFX_SPECIAL_ARG_LEVELS,
     IMG_FONT_TEXT_4_LEVELS
   },
+  {
+    FONT_TEXT_4,                               GFX_SPECIAL_ARG_LEVELNR,
+    IMG_FONT_TEXT_4_LEVELNR
+  },
+  {
+    FONT_TEXT_4,                               GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_TEXT_4_SETUP
+  },
   {
     FONT_TEXT_4,                               GFX_SPECIAL_ARG_SCORES,
     IMG_FONT_TEXT_4_SCORES
@@ -211,6 +267,10 @@ font_to_graphic[] =
     FONT_LEVEL_NUMBER,                         -1,
     IMG_FONT_LEVEL_NUMBER
   },
+  {
+    FONT_LEVEL_NUMBER_ACTIVE,                  -1,
+    IMG_FONT_LEVEL_NUMBER_ACTIVE
+  },
   {
     FONT_TAPE_RECORDER,                                -1,
     IMG_FONT_TAPE_RECORDER
@@ -219,6 +279,14 @@ font_to_graphic[] =
     FONT_GAME_INFO,                            -1,
     IMG_FONT_GAME_INFO
   },
+  {
+    FONT_INFO_ELEMENTS,                                -1,
+    IMG_FONT_INFO_ELEMENTS
+  },
+  {
+    FONT_INFO_LEVELSET,                                -1,
+    IMG_FONT_INFO_LEVELSET
+  },
   {
     -1,                                                -1,
     -1