X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=3d3a02cc286c95d245c24b7217de926c1c46fdd4;hb=29fc833ae1b5e46a429a9fa82098e8ad94f6f400;hp=5a97a827c04b233c654bc8febe8f56caa9ebd07c;hpb=601cca5b35649856ff49e1bcb3806592b736662c;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 5a97a827..3d3a02cc 100644
--- a/src/init.c
+++ b/src/init.c
@@ -167,6 +167,14 @@ static void InitArtworkConfig()
   static char *direction_suffix[NUM_DIRECTIONS + 1];
   static char *special_suffix[NUM_SPECIAL_GFX_ARGS + 1];
   static char *dummy[1] = { NULL };
+  static char *ignore_image_tokens[] =
+  {
+    "name",
+    "sort_priority",
+    "menu.main.hide_static_text",
+    "global.num_toons",
+    NULL
+  };
   int i;
 
   for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
@@ -181,9 +189,10 @@ static void InitArtworkConfig()
     special_suffix[i] = special_suffix_info[i].suffix;
 
   InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
-		element_prefix, action_suffix,direction_suffix,special_suffix);
+		element_prefix, action_suffix,direction_suffix, special_suffix,
+		ignore_image_tokens);
   InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
-		sound_class_prefix, action_suffix, dummy, dummy);
+		sound_class_prefix, action_suffix, dummy, dummy, dummy);
 }
 
 void InitLevelArtworkInfo()
@@ -257,10 +266,11 @@ static void ReinitializeMusic()
 static void InitImages()
 {
   ReloadCustomImages();
-  ReinitializeGraphics();
 
   LoadCustomElementDescriptions();
   LoadSpecialMenuDesignSettings();
+
+  ReinitializeGraphics();
 }
 
 static void InitSound()
@@ -585,11 +595,7 @@ void ReloadCustomArtwork()
 
     ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    ReloadCustomImages();
-    ReinitializeGraphics();
-
-    LoadCustomElementDescriptions();
-    LoadSpecialMenuDesignSettings();
+    InitImages();
 
     FreeTileClipmasks();
     InitTileClipmasks();
@@ -796,7 +802,7 @@ void InitElementGraphicInfo()
     }
   }
 
-#if 1
+#if 0
 #if DEBUG
   if (options.verbose)
   {
@@ -857,7 +863,7 @@ void InitElementSpecialGraphicInfo()
 
 static void InitElementSoundInfo()
 {
-  /* soon to come */
+  /* !!! soon to come !!! */
 }
 
 static void set_graphic_parameters(int graphic, char **parameter_raw)
@@ -1695,14 +1701,6 @@ void InitElementProperties()
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
-    EL_KEY1,
-    EL_KEY2,
-    EL_KEY3,
-    EL_KEY4,
-    EL_EM_KEY1,
-    EL_EM_KEY2,
-    EL_EM_KEY3,
-    EL_EM_KEY4,
     EL_BOMB,
     EL_NUT,
     EL_AMOEBA_DROP,