X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f64d25931c19c3860f4e13126d5532ccefb0703a;hb=28f0f8708f4b4f8c4f39f1b23bc5fc7e0fed7579;hp=bc31c194de0672b1a07164c40710502c6d7562ca;hpb=463778af29aada177d4a00c566653b92be3b507a;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index bc31c194..f64d2593 100644
--- a/src/game.c
+++ b/src/game.c
@@ -153,7 +153,7 @@ static struct
   { NULL,		0,			0 },
 };
 static int element_action_sound[NUM_LEVEL_ELEMENTS][NUM_SND_ACTIONS];
-static boolean is_loop_sound[NUM_SOUND_EFFECTS];
+static boolean is_loop_sound[NUM_SOUND_CONFIG_ENTRIES];
 
 #define IS_LOOP_SOUND(x)	(is_loop_sound[x])
 
@@ -507,7 +507,7 @@ void DrawGameDoorValues()
 
 void InitGameSound()
 {
-  int sound_effect_properties[NUM_SOUND_EFFECTS];
+  int sound_effect_properties[NUM_SOUND_CONFIG_ENTRIES];
   int i, j;
 
 #if 0
@@ -518,9 +518,9 @@ void InitGameSound()
     for (j=0; j<NUM_LEVEL_ELEMENTS; j++)
       element_action_sound[j][i] = -1;
 
-  for (i=0; i<NUM_SOUND_EFFECTS; i++)
+  for (i=0; i<NUM_SOUND_CONFIG_ENTRIES; i++)
   {
-    int len_effect_text = strlen(sound_effects[i].text);
+    int len_effect_text = strlen(sound_config[i].token);
 
     sound_effect_properties[i] = SND_ACTION_UNKNOWN;
     is_loop_sound[i] = FALSE;
@@ -533,7 +533,7 @@ void InitGameSound()
       int len_action_text = strlen(sound_action_properties[j].text);
 
       if (len_action_text < len_effect_text &&
-	  strcmp(&sound_effects[i].text[len_effect_text - len_action_text],
+	  strcmp(&sound_config[i].token[len_effect_text - len_action_text],
 		 sound_action_properties[j].text) == 0)
       {
 	sound_effect_properties[i] = sound_action_properties[j].value;
@@ -554,9 +554,9 @@ void InitGameSound()
 	int len_class_text = strlen(element_info[j].sound_class_name);
 
 	if (len_class_text + 1 < len_effect_text &&
-	    strncmp(sound_effects[i].text,
+	    strncmp(sound_config[i].token,
 		    element_info[j].sound_class_name, len_class_text) == 0 &&
-	    sound_effects[i].text[len_class_text] == '.')
+	    sound_config[i].token[len_class_text] == '.')
 	{
 	  int sound_action_value = sound_effect_properties[i];
 
@@ -6482,8 +6482,8 @@ boolean PlaceBomb(struct PlayerInfo *player)
 
 void PlaySoundLevel(int x, int y, int nr)
 {
-  static int loop_sound_frame[NUM_SOUND_EFFECTS];
-  static int loop_sound_volume[NUM_SOUND_EFFECTS];
+  static int loop_sound_frame[NUM_SOUND_CONFIG_ENTRIES];
+  static int loop_sound_volume[NUM_SOUND_CONFIG_ENTRIES];
   int sx = SCREENX(x), sy = SCREENY(y);
   int volume, stereo_position;
   int max_distance = 8;