moved color handling functions to separate source files for BD engine

[rocksndiamonds.git] / src / game_bd / bd_sound.c

diff --git a/src/game_bd/bd_sound.c b/src/game_bd/bd_sound.c
index 2087da4cc77652328a465d26446122f59545a1d7..387ea00df8deb95007102e92e5e677ed65953f7a 100644 (file)
--- a/src/game_bd/bd_sound.c
+++ b/src/game_bd/bd_sound.c
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <glib.h>
-
 #include "main_bd.h"
 
 
@@ -333,13 +331,13 @@ static void play_sound(int channel, GdSound sound)
 
   /* change diamond falling random to a selected diamond falling sound. */
   if (sound == GD_S_DIAMOND_FALLING_RANDOM)
-    sound = diamond_falling_sounds[g_random_int_range(0, 8)];
+    sound = diamond_falling_sounds[gd_random_int_range(0, 8)];
   else if (sound == GD_S_DIAMOND_IMPACT_RANDOM)
-    sound = diamond_impact_sounds[g_random_int_range(0, 8)];
+    sound = diamond_impact_sounds[gd_random_int_range(0, 8)];
   else if (sound == GD_S_FLYING_DIAMOND_FALLING_RANDOM)
-    sound = flying_diamond_falling_sounds[g_random_int_range(0, 8)];
+    sound = flying_diamond_falling_sounds[gd_random_int_range(0, 8)];
   else if (sound == GD_S_FLYING_DIAMOND_IMPACT_RANDOM)
-    sound = flying_diamond_impact_sounds[g_random_int_range(0, 8)];
+    sound = flying_diamond_impact_sounds[gd_random_int_range(0, 8)];
 
   /* channel 1 may have been changed to channel 4 above. */
 
@@ -368,7 +366,7 @@ void gd_sound_off(void)
   int i;
 
   /* stop all sounds. */
-  for (i = 0; i < G_N_ELEMENTS(snd_playing); i++)
+  for (i = 0; i < ARRAY_SIZE(snd_playing); i++)
     halt_channel(i);
 }