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

diff --git a/src/init.c b/src/init.c
index 41743eac..5a97a827 100644
--- a/src/init.c
+++ b/src/init.c
@@ -27,58 +27,36 @@
 #include "config.h"
 
 #include "conf_e2g.c"	/* include auto-generated data structure definitions */
+#include "conf_esg.c"	/* include auto-generated data structure definitions */
 
 
-static char *image_filename[NUM_PICTURES] =
-{
-#if 0
-  "RocksScreen.pcx",
-  "RocksDoor.pcx",
-  "RocksToons.pcx",
-  "RocksFontBig.pcx",
-  "RocksFontSmall.pcx",
-  "RocksFontMedium.pcx",
-  "RocksFontEM.pcx"
-#else
-  "RocksScreen.pcx",
-  "RocksElements.pcx",
-  "RocksDoor.pcx",
-  "RocksHeroes.pcx",
-  "RocksToons.pcx",
-  "RocksSP.pcx",
-  "RocksDC.pcx",
-  "RocksMore.pcx",
-  "RocksFontBig.pcx",
-  "RocksFontSmall.pcx",
-  "RocksFontMedium.pcx",
-  "RocksFontEM.pcx"
-#endif
-}; 
-
 static Bitmap *bitmap_font_initial = NULL;
 
-static void InitGlobal(void);
-static void InitSetup(void);
-static void InitPlayerInfo(void);
-static void InitLevelInfo(void);
-static void InitArtworkInfo(void);
-static void InitLevelArtworkInfo(void);
-static void InitNetworkServer(void);
-static void InitArtworkConfig(void);
-static void InitImages(void);
-static void InitMixer(void);
-static void InitSound(void);
-static void InitMusic(void);
-static void InitGfx(void);
-static void InitGfxBackground(void);
-static void InitGadgets(void);
-static void InitElementProperties(void);
-static void InitElementInfo(void);
-static void InitGraphicInfo(void);
+static void InitGlobal();
+static void InitSetup();
+static void InitPlayerInfo();
+static void InitLevelInfo();
+static void InitArtworkInfo();
+static void InitLevelArtworkInfo();
+static void InitNetworkServer();
+static void InitArtworkConfig();
+static void InitImages();
+static void InitMixer();
+static void InitSound();
+static void InitMusic();
+static void InitGfx();
+static void InitGfxBackground();
+static void InitGadgets();
+static void InitElementSmallImages();
+static void InitElementGraphicInfo();
+static void InitElementSpecialGraphicInfo();
+static void InitElementSoundInfo();
+static void InitElementProperties();
+static void InitGraphicInfo();
 static void InitSoundInfo();
 static void Execute_Command(char *);
 
-void OpenAll(void)
+void OpenAll()
 {
   InitGlobal();		/* initialize some global variables */
 
@@ -119,7 +97,6 @@ void OpenAll(void)
   InitEventFilter(FilterMouseMotionEvents);
 
   InitElementProperties();
-  InitElementInfo();
 
   InitGfx();
 
@@ -185,22 +162,28 @@ static void InitArtworkInfo()
 static void InitArtworkConfig()
 {
   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 *special_suffix[NUM_SPECIAL_GFX_ARGS + 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] = element_action_info[i].suffix;
   for (i=0; i<NUM_DIRECTIONS + 1; i++)
     direction_suffix[i] = element_direction_info[i].suffix;
+  for (i=0; i<NUM_SPECIAL_GFX_ARGS + 1; i++)
+    special_suffix[i] = special_suffix_info[i].suffix;
 
   InitImageList(image_config, NUM_IMAGE_FILES, image_config_suffix,
-		element_prefix, action_suffix, direction_suffix);
+		element_prefix, action_suffix,direction_suffix,special_suffix);
   InitSoundList(sound_config, NUM_SOUND_FILES, sound_config_suffix,
-		element_prefix, action_suffix, dummy);
+		sound_class_prefix, action_suffix, dummy, dummy);
 }
 
 void InitLevelArtworkInfo()
@@ -239,7 +222,11 @@ static void InitMixer()
 
 static void ReinitializeGraphics()
 {
-  InitGraphicInfo();	/* initialize graphic info from config file */
+  InitElementGraphicInfo();		/* element game graphic mapping */
+  InitElementSpecialGraphicInfo();	/* element special graphic mapping */
+  InitGraphicInfo();			/* graphic properties mapping */
+
+  InitElementSmallImages();		/* create editor and preview images */
 
   InitFontInfo(bitmap_font_initial,
 	       graphic_info[IMG_FONT_BIG].bitmap,
@@ -256,7 +243,10 @@ static void ReinitializeGraphics()
 
 static void ReinitializeSounds()
 {
-  InitSoundInfo();	/* initialize sounds info from config file */
+  InitElementSoundInfo();	/* element game sound mapping */
+  InitSoundInfo();		/* sound properties mapping */
+
+  InitPlaySoundLevel();		/* internal game sound settings */
 }
 
 static void ReinitializeMusic()
@@ -268,6 +258,9 @@ static void InitImages()
 {
   ReloadCustomImages();
   ReinitializeGraphics();
+
+  LoadCustomElementDescriptions();
+  LoadSpecialMenuDesignSettings();
 }
 
 static void InitSound()
@@ -458,9 +451,17 @@ void FreeTileClipmasks()
 
 void InitGfx()
 {
-#if 0
+  char *config_token_font_initial = "font.small";
+  char *filename_font_initial = NULL;
   int i;
-#endif
+
+  /* determine filename for initial font (for displaying startup messages) */
+  for (i=0; image_config[i].token != NULL; i++)
+    if (strcmp(image_config[i].token, config_token_font_initial) == 0)
+      filename_font_initial = image_config[i].value;
+
+  if (filename_font_initial == NULL)	/* should not happen */
+    Error(ERR_EXIT, "cannot get filename for '%s'", config_token_font_initial);
 
   /* initialize screen properties */
   InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
@@ -473,40 +474,15 @@ void InitGfx()
   bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
   bitmap_db_door  = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
 
-#if 0
-  pix[PIX_FONT_SMALL] = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
-
-  InitFontInfo(NULL, NULL, pix[PIX_FONT_SMALL], NULL);
-#else
-  bitmap_font_initial = LoadCustomImage(image_filename[PIX_FONT_SMALL]);
+  bitmap_font_initial = LoadCustomImage(filename_font_initial);
 
   InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL);
-#endif
 
   DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
   DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
 
   DrawInitText("Loading graphics:", 120, FC_GREEN);
 
-#if 0
-  for (i=0; i<NUM_PICTURES; i++)
-  {
-#if 0
-    if (i != PIX_FONT_SMALL)
-#endif
-    {
-      DrawInitText(image_filename[i], 150, FC_YELLOW);
-
-      pix[i] = LoadCustomImage(image_filename[i]);
-    }
-  }
-#endif
-
-#if 0
-  InitFontInfo(pix[PIX_FONT_BIG], pix[PIX_FONT_MEDIUM], pix[PIX_FONT_SMALL],
-	       pix[PIX_FONT_EM]);
-#endif
-
   InitTileClipmasks();
 }
 
@@ -612,6 +588,9 @@ void ReloadCustomArtwork()
     ReloadCustomImages();
     ReinitializeGraphics();
 
+    LoadCustomElementDescriptions();
+    LoadSpecialMenuDesignSettings();
+
     FreeTileClipmasks();
     InitTileClipmasks();
 
@@ -693,8 +672,29 @@ void InitGadgets()
   gadgets_initialized = TRUE;
 }
 
-void InitElementInfo()
+void InitElementSmallImages()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i;
+
+  /* initialize normal images from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_graphic[i].graphic);
+
+  /* initialize special images from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
+    CreateImageWithSmallImages(element_to_special_graphic[i].graphic);
+
+  /* initialize images from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+    CreateImageWithSmallImages(property_mapping[i].artwork_index);
+}
+
+void InitElementGraphicInfo()
 {
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
   int i, act, dir;
 
   /* set values to -1 to identify later as "uninitialized" values */
@@ -709,6 +709,7 @@ void InitElementInfo()
     }
   }
 
+#if 0
   for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
     element_info[i].graphic[ACTION_DEFAULT] =
       IMG_CHAR_START + (i - EL_CHAR_START);
@@ -716,28 +717,44 @@ void InitElementInfo()
   for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++)
     element_info[i].graphic[ACTION_DEFAULT] =
       IMG_CUSTOM_START + (i - EL_CUSTOM_START);
+#endif
 
-  i = 0;
-  while (element_to_graphic[i].element > -1)
+  /* initialize normal element/graphic mapping from static configuration */
+  for (i=0; element_to_graphic[i].element > -1; i++)
   {
     int element   = element_to_graphic[i].element;
-    int direction = element_to_graphic[i].direction;
     int action    = element_to_graphic[i].action;
+    int direction = element_to_graphic[i].direction;
     int graphic   = element_to_graphic[i].graphic;
 
     if (action < 0)
       action = ACTION_DEFAULT;
 
     if (direction > -1)
-    {
-      direction = MV_DIR_BIT(direction);
-
       element_info[element].direction_graphic[action][direction] = graphic;
-    }
     else
       element_info[element].graphic[action] = graphic;
+  }
+
+  /* initialize normal element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    int element   = property_mapping[i].base_index;
+    int action    = property_mapping[i].ext1_index;
+    int direction = property_mapping[i].ext2_index;
+    int special   = property_mapping[i].ext3_index;
+    int graphic   = property_mapping[i].artwork_index;
+
+    if (special != -1)
+      continue;
 
-    i++;
+    if (action < 0)
+      action = ACTION_DEFAULT;
+
+    if (direction > -1)
+      element_info[element].direction_graphic[action][direction] = graphic;
+    else
+      element_info[element].graphic[action] = graphic;
   }
 
   /* now set all '-1' values to element specific default values */
@@ -778,26 +795,126 @@ void InitElementInfo()
 	element_info[i].graphic[act] = default_action_graphic;
     }
   }
+
+#if 1
+#if DEBUG
+  if (options.verbose)
+  {
+    for (i=0; i<MAX_NUM_ELEMENTS; i++)
+      if (element_info[i].graphic[ACTION_DEFAULT] == IMG_CHAR_QUESTION &&
+	  i != EL_CHAR_QUESTION)
+	Error(ERR_RETURN, "warning: no graphic for element '%s' (%d)",
+	      element_info[i].token_name, i);
+  }
+#endif
+#endif
 }
 
-static void set_graphic_parameters(int graphic, int *parameter)
+void InitElementSpecialGraphicInfo()
+{
+  struct PropertyMapping *property_mapping = getImageListPropertyMapping();
+  int num_property_mappings = getImageListPropertyMappingSize();
+  int i;
+
+  /* always start with reliable default values */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    element_info[i].editor_graphic = element_info[i].graphic[ACTION_DEFAULT];
+    element_info[i].preview_graphic = element_info[i].graphic[ACTION_DEFAULT];
+  }
+
+  /* initialize special element/graphic mapping from static configuration */
+  for (i=0; element_to_special_graphic[i].element > -1; i++)
+  {
+    int element = element_to_special_graphic[i].element;
+    int special = element_to_special_graphic[i].special;
+    int graphic = element_to_special_graphic[i].graphic;
+    boolean base_redefined = getImageListEntry(el2img(element))->redefined;
+    boolean special_redefined = getImageListEntry(graphic)->redefined;
+
+    if (base_redefined && !special_redefined)
+      continue;
+
+    if (special == GFX_SPECIAL_ARG_EDITOR)
+      element_info[element].editor_graphic = graphic;
+    else if (special == GFX_SPECIAL_ARG_PREVIEW)
+      element_info[element].preview_graphic = graphic;
+  }
+
+  /* initialize special element/graphic mapping from dynamic configuration */
+  for (i=0; i < num_property_mappings; i++)
+  {
+    int element = property_mapping[i].base_index;
+    int special = property_mapping[i].ext3_index;
+    int graphic = property_mapping[i].artwork_index;
+
+    if (special == GFX_SPECIAL_ARG_EDITOR)
+      element_info[element].editor_graphic = graphic;
+    else if (special == GFX_SPECIAL_ARG_PREVIEW)
+      element_info[element].preview_graphic = graphic;
+  }
+}
+
+static void InitElementSoundInfo()
+{
+  /* soon to come */
+}
+
+static void set_graphic_parameters(int graphic, char **parameter_raw)
 {
   Bitmap *src_bitmap = getBitmapFromImageID(graphic);
   int num_xtiles = (src_bitmap ? src_bitmap->width          : TILEX) / TILEX;
   int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
+  int parameter[NUM_GFX_ARGS];
+  int i;
 
-  graphic_info[graphic].bitmap = src_bitmap;
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_GFX_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(image_config_suffix[i].type, parameter_raw[i]);
 
-  graphic_info[graphic].src_x = parameter[GFX_ARG_XPOS] * TILEX;
-  graphic_info[graphic].src_y = parameter[GFX_ARG_YPOS] * TILEY;
-  graphic_info[graphic].offset_x = parameter[GFX_ARG_OFFSET];
-  graphic_info[graphic].offset_y = 0;
+  graphic_info[graphic].bitmap = src_bitmap;
 
-  /* animation frames are ordered vertically instead of horizontally */
-  if (parameter[GFX_ARG_VERTICAL])
+  /* start with reliable default values */
+  graphic_info[graphic].src_x = 0;
+  graphic_info[graphic].src_y = 0;
+  graphic_info[graphic].width = TILEX;
+  graphic_info[graphic].height = TILEY;
+  graphic_info[graphic].offset_x = 0;	/* one or both of these values ... */
+  graphic_info[graphic].offset_y = 0;	/* ... will be corrected later */
+
+  /* optional x and y tile position of animation frame sequence */
+  if (parameter[GFX_ARG_XPOS] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_x = parameter[GFX_ARG_XPOS] * TILEX;
+  if (parameter[GFX_ARG_YPOS] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+
+  /* optional x and y pixel position of animation frame sequence */
+  if (parameter[GFX_ARG_X] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_x = parameter[GFX_ARG_X];
+  if (parameter[GFX_ARG_Y] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].src_y = parameter[GFX_ARG_Y];
+
+  /* optional width and height of each animation frame */
+  if (parameter[GFX_ARG_WIDTH] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].width = parameter[GFX_ARG_WIDTH];
+  if (parameter[GFX_ARG_HEIGHT] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].height = parameter[GFX_ARG_HEIGHT];
+
+  /* correct x or y offset dependant of vertical or horizontal frame order */
+  if (parameter[GFX_ARG_VERTICAL])	/* frames are ordered vertically */
+  {
+    if (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE)
+      graphic_info[graphic].offset_y = parameter[GFX_ARG_OFFSET];
+    else
+      graphic_info[graphic].offset_y = graphic_info[graphic].height;
+  }
+  else					/* frames are ordered horizontally */
   {
-    graphic_info[graphic].offset_x = 0;
-    graphic_info[graphic].offset_y = parameter[GFX_ARG_OFFSET];
+    if (parameter[GFX_ARG_OFFSET] != ARG_UNDEFINED_VALUE)
+      graphic_info[graphic].offset_x = parameter[GFX_ARG_OFFSET];
+    else
+      graphic_info[graphic].offset_x = graphic_info[graphic].width;
   }
 
   /* optionally, the x and y offset of frames can be specified directly */
@@ -851,11 +968,19 @@ static void set_graphic_parameters(int graphic, int *parameter)
 
   /* animation synchronized with global frame counter, not move position */
   graphic_info[graphic].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+
+  /* this is only used for toon animations */
+  graphic_info[graphic].step_offset = parameter[GFX_ARG_STEP_OFFSET];
+  graphic_info[graphic].step_delay  = parameter[GFX_ARG_STEP_DELAY];
 }
 
 static void InitGraphicInfo()
 {
   static boolean clipmasks_initialized = FALSE;
+  int fallback_graphic = IMG_CHAR_EXCLAM;
+  struct FileInfo *fallback_image = getImageListEntry(fallback_graphic);
+  Bitmap *fallback_bitmap = getBitmapFromImageID(fallback_graphic);
+  int num_images = getImageListSize();
   int i;
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
   Pixmap src_pixmap;
@@ -864,12 +989,15 @@ static void InitGraphicInfo()
   GC copy_clipmask_gc = None;
 #endif
 
-  image_files = getCurrentImageList();
+  if (graphic_info != NULL)
+    free(graphic_info);
+
+  graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
   if (clipmasks_initialized)
   {
-    for (i=0; i<NUM_IMAGE_FILES; i++)
+    for (i=0; i<num_images; i++)
     {
       if (graphic_info[i].clip_mask)
 	XFreePixmap(display, graphic_info[i].clip_mask);
@@ -882,13 +1010,14 @@ static void InitGraphicInfo()
   }
 #endif
 
-  for (i=0; i<NUM_IMAGE_FILES; i++)
+  for (i=0; i<num_images; i++)
   {
+    struct FileInfo *image = getImageListEntry(i);
     Bitmap *src_bitmap;
     int src_x, src_y;
     int first_frame, last_frame;
 
-    set_graphic_parameters(i, image_files[i].parameter);
+    set_graphic_parameters(i, image->parameter);
 
     /* now check if no animation frames are outside of the loaded image */
 
@@ -913,9 +1042,15 @@ static void InitGraphicInfo()
 	    "error: first animation frame out of bounds (%d, %d)",
 	    src_x, src_y);
       Error(ERR_RETURN, "custom graphic rejected for this element/action");
+
+      if (i == fallback_graphic)
+	Error(ERR_EXIT, "fatal error: no fallback graphic available");
+
+      Error(ERR_RETURN, "fallback done to 'char_exclam' for this graphic");
       Error(ERR_RETURN_LINE, "-");
 
-      set_graphic_parameters(i, image_files[i].default_parameter);
+      set_graphic_parameters(i, fallback_image->default_parameter);
+      graphic_info[i].bitmap = fallback_bitmap;
     }
 
     last_frame = graphic_info[i].anim_frames - 1;
@@ -936,9 +1071,15 @@ static void InitGraphicInfo()
 	    "error: last animation frame (%d) out of bounds (%d, %d)",
 	    last_frame, src_x, src_y);
       Error(ERR_RETURN, "custom graphic rejected for this element/action");
+
+      if (i == fallback_graphic)
+	Error(ERR_EXIT, "fatal error: no fallback graphic available");
+
+      Error(ERR_RETURN, "fallback done to 'char_exclam' for this graphic");
       Error(ERR_RETURN_LINE, "-");
 
-      set_graphic_parameters(i, image_files[i].default_parameter);
+      set_graphic_parameters(i, fallback_image->default_parameter);
+      graphic_info[i].bitmap = fallback_bitmap;
     }
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
@@ -976,8 +1117,16 @@ static void InitGraphicInfo()
   clipmasks_initialized = TRUE;
 }
 
-static void set_sound_parameters(int sound, int *parameter)
+static void set_sound_parameters(int sound, char **parameter_raw)
 {
+  int parameter[NUM_SND_ARGS];
+  int i;
+
+  /* get integer values from string parameters */
+  for (i=0; i < NUM_SND_ARGS; i++)
+    parameter[i] =
+      get_parameter_value(sound_config_suffix[i].type, parameter_raw[i]);
+
   /* explicit loop mode setting in configuration overrides default value */
   if (parameter[SND_ARG_MODE_LOOP] != ARG_UNDEFINED_VALUE)
     sound_info[sound].loop = parameter[SND_ARG_MODE_LOOP];
@@ -985,19 +1134,25 @@ static void set_sound_parameters(int sound, int *parameter)
 
 static void InitSoundInfo()
 {
-  int sound_effect_properties[NUM_SOUND_FILES];
+  int *sound_effect_properties;
+  int num_sounds = getSoundListSize();
   int i, j;
 
-  sound_files = getCurrentSoundList();
+  if (sound_info != NULL)
+    free(sound_info);
+
+  sound_effect_properties = checked_calloc(num_sounds * sizeof(int));
+  sound_info = checked_calloc(num_sounds * sizeof(struct SoundInfo));
 
   /* initialize sound effect for all elements to "no sound" */
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
     for (j=0; j<NUM_ACTIONS; j++)
       element_info[i].sound[j] = SND_UNDEFINED;
 
-  for (i=0; i<NUM_SOUND_FILES; i++)
+  for (i=0; i<num_sounds; i++)
   {
-    int len_effect_text = strlen(sound_files[i].token);
+    struct FileInfo *sound = getSoundListEntry(i);
+    int len_effect_text = strlen(sound->token);
 
     sound_effect_properties[i] = ACTION_OTHER;
     sound_info[i].loop = FALSE;
@@ -1009,7 +1164,7 @@ static void InitSoundInfo()
       int len_action_text = strlen(element_action_info[j].suffix);
 
       if (len_action_text < len_effect_text &&
-	  strcmp(&sound_files[i].token[len_effect_text - len_action_text],
+	  strcmp(&sound->token[len_effect_text - len_action_text],
 		 element_action_info[j].suffix) == 0)
       {
 	sound_effect_properties[i] = element_action_info[j].value;
@@ -1028,9 +1183,9 @@ static void InitSoundInfo()
 	int len_class_text = strlen(element_info[j].sound_class_name);
 
 	if (len_class_text + 1 < len_effect_text &&
-	    strncmp(sound_files[i].token,
+	    strncmp(sound->token,
 		    element_info[j].sound_class_name, len_class_text) == 0 &&
-	    sound_files[i].token[len_class_text] == '.')
+	    sound->token[len_class_text] == '.')
 	{
 	  int sound_action_value = sound_effect_properties[i];
 
@@ -1039,9 +1194,11 @@ static void InitSoundInfo()
       }
     }
 
-    set_sound_parameters(i, sound_files[i].parameter);
+    set_sound_parameters(i, sound->parameter);
   }
 
+  free(sound_effect_properties);
+
 #if 0
   /* TEST ONLY */
   {