rnd-20051205-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index b49b9bfe67f7e912ffc3f81c07c9f018faeb3758..5c0e99c80c124e764983a8331fe7f72a43f08dbd 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -202,9 +202,27 @@ void InitFontGraphicInfo()
     int font_nr = font_to_graphic[i].font_nr;
     int special = font_to_graphic[i].special;
     int graphic = font_to_graphic[i].graphic;
+#if 1
+    int base_graphic =
+      font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
+#endif
 
     if (special >= 0 && special < NUM_SPECIAL_GFX_ARGS)
     {
+#if 1
+      boolean base_redefined =
+       getImageListEntryFromImageID(base_graphic)->redefined;
+      boolean special_redefined =
+       getImageListEntryFromImageID(graphic)->redefined;
+
+      /* if the base font ("font.title_1", for example) has been redefined,
+        but not the special font ("font.title_1.LEVELS", for example), do not
+        use an existing (in this case considered obsolete) special font
+        anymore, but use the automatically determined default font */
+      if (base_redefined && !special_redefined)
+       continue;
+#endif
+
       font_info[font_nr].special_graphic[special] = graphic;
       font_info[font_nr].special_bitmap_id[special] = num_font_bitmaps;
       num_font_bitmaps++;