X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=b0d66991e22a29c6ba28a0a53e7ec26b1a6d27b2;hb=d905e6df72c773e1943694b96710a2bc25cc863e;hp=f55818968233c212c9537b76b37b8ec2c1998acf;hpb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index f5581896..b0d66991 100644
--- a/src/init.c
+++ b/src/init.c
@@ -250,7 +250,7 @@ void InitFontGraphicInfo()
     }
   }
 
-  /* initialize special element/graphic mapping from dynamic configuration */
+  /* initialize special font/graphic mapping from dynamic configuration */
   for (i = 0; i < num_property_mappings; i++)
   {
     int font_nr = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
@@ -268,6 +268,54 @@ void InitFontGraphicInfo()
     }
   }
 
+  /* reset non-redefined ".active" font graphics if normal font is redefined */
+  /* (this different treatment is needed because normal and active fonts are
+     independently defined ("active" is not a property of font definitions!) */
+  for (i = 0; i < NUM_FONTS; i++)
+  {
+    int font_nr_base = i;
+    int font_nr_active = FONT_ACTIVE(font_nr_base);
+
+    /* check only those fonts with exist as normal and ".active" variant */
+    if (font_nr_base != font_nr_active)
+    {
+      int base_graphic = font_info[font_nr_base].graphic;
+      int active_graphic = font_info[font_nr_active].graphic;
+      boolean base_redefined =
+	getImageListEntryFromImageID(base_graphic)->redefined;
+      boolean active_redefined =
+	getImageListEntryFromImageID(active_graphic)->redefined;
+
+      /* if the base font ("font.menu_1", for example) has been redefined,
+	 but not the active font ("font.menu_1.active", for example), do not
+	 use an existing (in this case considered obsolete) active font
+	 anymore, but use the automatically determined default font */
+      if (base_redefined && !active_redefined)
+	font_info[font_nr_active].graphic = base_graphic;
+
+      /* now also check each "special" font (which may be the same as above) */
+      for (j = 0; j < NUM_SPECIAL_GFX_ARGS; j++)
+      {
+	int base_graphic = font_info[font_nr_base].special_graphic[j];
+	int active_graphic = font_info[font_nr_active].special_graphic[j];
+	boolean base_redefined =
+	  getImageListEntryFromImageID(base_graphic)->redefined;
+	boolean active_redefined =
+	  getImageListEntryFromImageID(active_graphic)->redefined;
+
+	/* same as above, but check special graphic definitions, for example:
+	   redefined "font.menu_1.MAIN" invalidates "font.menu_1.active.MAIN" */
+	if (base_redefined && !active_redefined)
+	{
+	  font_info[font_nr_active].special_graphic[j] =
+	    font_info[font_nr_base].special_graphic[j];
+	  font_info[font_nr_active].special_bitmap_id[j] =
+	    font_info[font_nr_base].special_bitmap_id[j];
+	}
+      }
+    }
+  }
+
   /* ---------- initialize font bitmap array ---------- */
 
   if (font_bitmap_info != NULL)
@@ -4762,7 +4810,7 @@ void OpenAll()
   InitCounter();
 
   InitRND(NEW_RANDOMIZE);
-  InitSimpleRND(NEW_RANDOMIZE);
+  InitSimpleRandom(NEW_RANDOMIZE);
 
   InitJoysticks();