Merge branch 'master' into releases

[rocksndiamonds.git] / src / conf_fnt.c

diff --git a/src/conf_fnt.c b/src/conf_fnt.c
index 8eb96e51dd5e83690e2545ff4ead423344976c6b..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
@@ -79,6 +83,14 @@ font_to_graphic[] =
     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
@@ -92,8 +104,8 @@ font_to_graphic[] =
     IMG_FONT_TEXT_1_ACTIVE_SCORES
   },
   {
-    FONT_TEXT_1,                               GFX_SPECIAL_ARG_PLAYING,
-    IMG_FONT_TEXT_1_PLAYING
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_PANEL,
+    IMG_FONT_TEXT_1_PANEL
   },
   {
     FONT_TEXT_1,                               GFX_SPECIAL_ARG_DOOR,
@@ -111,6 +123,14 @@ font_to_graphic[] =
     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
@@ -131,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
@@ -155,6 +183,14 @@ font_to_graphic[] =
     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