X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_fnt.c;h=35d60b91022d085bd402345eb657b15942704dd5;hb=d905e6df72c773e1943694b96710a2bc25cc863e;hp=2b839be3d79d642d6737ce93cbc7ff877e3b3b7c;hpb=07bd1f7e496e8914d56ec4422b33492b8f66b1d0;p=rocksndiamonds.git

diff --git a/src/conf_fnt.c b/src/conf_fnt.c
index 2b839be3..35d60b91 100644
--- a/src/conf_fnt.c
+++ b/src/conf_fnt.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -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
@@ -59,10 +55,18 @@ font_to_graphic[] =
     FONT_MENU_1,				-1,
     IMG_FONT_MENU_1
   },
+  {
+    FONT_MENU_1_ACTIVE,				-1,
+    IMG_FONT_MENU_1_ACTIVE
+  },
   {
     FONT_MENU_2,				-1,
     IMG_FONT_MENU_2
   },
+  {
+    FONT_MENU_2_ACTIVE,				-1,
+    IMG_FONT_MENU_2_ACTIVE
+  },
   {
     FONT_TEXT_1,				-1,
     IMG_FONT_TEXT_1
@@ -71,13 +75,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 +95,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 +115,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 +140,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_INPUT,					GFX_SPECIAL_ARG_MAIN,
-    IMG_FONT_INPUT_MAIN
+    FONT_ENVELOPE_4,				-1,
+    IMG_FONT_ENVELOPE_4
   },
   {
-    FONT_INPUT_ACTIVE,				-1,
-    IMG_FONT_INPUT_ACTIVE
+    FONT_INPUT_1,				-1,
+    IMG_FONT_INPUT_1
   },
   {
-    FONT_INPUT_ACTIVE,				GFX_SPECIAL_ARG_MAIN,
-    IMG_FONT_INPUT_ACTIVE_MAIN
+    FONT_INPUT_1,				GFX_SPECIAL_ARG_MAIN,
+    IMG_FONT_INPUT_1_MAIN
   },
   {
-    FONT_INPUT_ACTIVE,				GFX_SPECIAL_ARG_SETUP,
-    IMG_FONT_INPUT_ACTIVE_SETUP
+    FONT_INPUT_1_ACTIVE,			-1,
+    IMG_FONT_INPUT_1_ACTIVE
+  },
+  {
+    FONT_INPUT_1_ACTIVE,			GFX_SPECIAL_ARG_MAIN,
+    IMG_FONT_INPUT_1_ACTIVE_MAIN
+  },
+  {
+    FONT_INPUT_1_ACTIVE,			GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_INPUT_1_ACTIVE_SETUP
+  },
+  {
+    FONT_INPUT_2,				-1,
+    IMG_FONT_INPUT_2
+  },
+  {
+    FONT_INPUT_2_ACTIVE,			-1,
+    IMG_FONT_INPUT_2_ACTIVE
   },
   {
     FONT_OPTION_OFF,				-1,
@@ -171,6 +215,10 @@ font_to_graphic[] =
     FONT_TAPE_RECORDER,				-1,
     IMG_FONT_TAPE_RECORDER
   },
+  {
+    FONT_GAME_INFO,				-1,
+    IMG_FONT_GAME_INFO
+  },
   {
     -1,						-1,
     -1