X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_fnt.c;h=bc2f1d017cd43f6453c2797d47e08597db5dad1b;hb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;hp=63f5b690a4516520291a08a60432fc0001172ac5;hpb=5a5342a6ab48037839b783adc4f3304331834a8c;p=rocksndiamonds.git

diff --git a/src/conf_fnt.c b/src/conf_fnt.c
index 63f5b690..bc2f1d01 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                            *
@@ -20,10 +20,10 @@
 
 static struct
 {
-    int font_nr;
-    int special;
+  int font_nr;
+  int special;
 
-    int graphic;
+  int graphic;
 }
 font_to_graphic[] =
 {
@@ -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,					GFX_SPECIAL_ARG_MAIN,
-    IMG_FONT_INPUT_MAIN
+    FONT_INPUT_1_ACTIVE,			-1,
+    IMG_FONT_INPUT_1_ACTIVE
   },
   {
-    FONT_INPUT_ACTIVE,				-1,
-    IMG_FONT_INPUT_ACTIVE
+    FONT_INPUT_1_ACTIVE,			GFX_SPECIAL_ARG_MAIN,
+    IMG_FONT_INPUT_1_ACTIVE_MAIN
   },
   {
-    FONT_INPUT_ACTIVE,				GFX_SPECIAL_ARG_MAIN,
-    IMG_FONT_INPUT_ACTIVE_MAIN
+    FONT_INPUT_1_ACTIVE,			GFX_SPECIAL_ARG_SETUP,
+    IMG_FONT_INPUT_1_ACTIVE_SETUP
   },
   {
-    FONT_INPUT_ACTIVE,				GFX_SPECIAL_ARG_SETUP,
-    IMG_FONT_INPUT_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 +207,10 @@ font_to_graphic[] =
     FONT_TAPE_RECORDER,				-1,
     IMG_FONT_TAPE_RECORDER
   },
+  {
+    FONT_GAME_INFO,				-1,
+    IMG_FONT_GAME_INFO
+  },
   {
     -1,						-1,
     -1