X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Finit.c;h=ea3e538bcb9411cf0b0fa286ef5c0fc33220e516;hb=be2766c926ff78b2985565fd9c12390eb5655112;hp=2b7836e2c2a8633f9e7925c15d554bc9b4e6fb64;hpb=7b47ce7ba0f673f0de5130daf5726104d0b38902;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 2b7836e2..ea3e538b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -184,21 +184,26 @@ static void InitArtworkInfo()
 
 static void InitArtworkConfig()
 {
-  static struct ConfigInfo action_suffix[NUM_ACTIONS + 1];
-  static struct ConfigInfo direction_suffix[NUM_DIRECTIONS + 1];
-  static struct ConfigInfo empty[1];
+  static char *element_prefix[MAX_NUM_ELEMENTS + 1];
+  static char *sound_class_prefix[MAX_NUM_ELEMENTS + 1];
+  static char *action_suffix[NUM_ACTIONS + 1];
+  static char *direction_suffix[NUM_DIRECTIONS + 1];
+  static char *dummy[1] = { NULL };
   int i;
 
+  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
+    element_prefix[i] = element_info[i].token_name;
+  for (i=0; i<MAX_NUM_ELEMENTS + 1; i++)
+    sound_class_prefix[i] = element_info[i].sound_class_name;
   for (i=0; i<NUM_ACTIONS + 1; i++)
-    action_suffix[i].token = element_action_info[i].suffix;
+    action_suffix[i] = element_action_info[i].suffix;
   for (i=0; i<NUM_DIRECTIONS + 1; i++)
-    direction_suffix[i].token = element_direction_info[i].suffix;
-  empty[0].token = NULL;
+    direction_suffix[i] = element_direction_info[i].suffix;
 
   InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
-		action_suffix, direction_suffix);
+		element_prefix, action_suffix, direction_suffix);
   InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
-		action_suffix, empty);
+		sound_class_prefix, action_suffix, dummy);
 }
 
 void InitLevelArtworkInfo()