X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Finit.c;h=679993a6c24dfede2368fc82626bca38e6220f9c;hp=b7febbb81f4bfbc8df42a602c122b1bd92c339a1;hb=f47cd4b09952aaf95d16542f6b53f2d8bf9e1d7d;hpb=7d171d862abdecced79f60535b49a686386cefe1

diff --git a/src/game_em/init.c b/src/game_em/init.c
index b7febbb8..679993a6 100644
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -33,6 +33,9 @@ GC spriteGC;
 #endif
 
 char play[SAMPLE_MAX];
+int play_x[SAMPLE_MAX];
+int play_y[SAMPLE_MAX];
+int play_element[SAMPLE_MAX];
 
 #if defined(AUDIO_UNIX_NATIVE)
 static int sound_pid = -1;
@@ -40,21 +43,76 @@ int sound_pipe[2] = { -1, -1 };		/* for communication */
 short *sound_data[SAMPLE_MAX];		/* pointer to sound data */
 long sound_length[SAMPLE_MAX];		/* length of sound data */
 
+static boolean use_native_em_sound = 0;
+
 static const char *sound_names[SAMPLE_MAX] =
 {
-  "00.blank.au","01.roll.au","02.stone.au","03.nut.au","04.crack.au",
-  "05.bug.au","06.tank.au","07.android.au","08.spring.au","09.slurp.au",
-  "10.eater.au","11.alien.au","12.collect.au","13.diamond.au","14.squash.au",
-  "15.drip.au","16.push.au","17.dirt.au","18.acid.au","19.ball.au",
-  "20.grow.au","21.wonder.au","22.door.au","23.exit.au","24.dynamite.au",
-  "25.tick.au","26.press.au","27.wheel.au","28.boom.au","29.time.au",
+  "00.blank.au",
+  "01.roll.au",
+  "02.stone.au",
+  "03.nut.au",
+  "04.crack.au",
+  "05.bug.au",
+  "06.tank.au",
+  "07.android.au",
+  "08.spring.au",
+  "09.slurp.au",
+  "10.eater.au",
+  "11.alien.au",
+  "12.collect.au",
+  "13.diamond.au",
+  "14.squash.au",
+  "14.squash.au",
+  "15.drip.au",
+  "16.push.au",
+  "17.dirt.au",
+  "18.acid.au",
+  "19.ball.au",
+  "20.grow.au",
+  "21.wonder.au",
+  "22.door.au",
+  "23.exit.au",
+  "24.dynamite.au",
+  "25.tick.au",
+  "26.press.au",
+  "27.wheel.au",
+  "28.boom.au",
+  "29.time.au",
   "30.die.au"
 };
 static const int sound_volume[SAMPLE_MAX] =
 {
-  20,100,100,100,100,20,20,100,100,100,
-  50,100,100,100,100,100,100,100,100,100,
-  100,20,100,100,100,100,100,20,100,100,
+  20,
+  100,
+  100,
+  100,
+  100,
+  20,
+  20,
+  100,
+  100,
+  100,
+  50,
+  100,
+  100,
+  100,
+  100,
+  100,
+  100,
+  100,
+  100,
+  100,
+  100,
+  100,
+  20,
+  100,
+  100,
+  100,
+  100,
+  100,
+  20,
+  100,
+  100,
   100
 };
 #endif
@@ -110,7 +168,7 @@ int open_all(void)
 
 #if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD)
 
-  if (1)
+  if (use_native_em_sound)
   {
     char name[MAXNAME+2];
     int i;
@@ -220,10 +278,55 @@ void em_close_all(void)
 
 /* ---------------------------------------------------------------------- */
 
+extern unsigned int screen_x;
+extern unsigned int screen_y;
+
+void play_element_sound(int x, int y, int sample, int element)
+{
+#if 0
+  unsigned int left = screen_x / TILEX;
+  unsigned int top  = screen_y / TILEY;
+
+  if ((x == -1 && y == -1) ||	/* play sound in the middle of the screen */
+      ((unsigned int)(y - top)  <= SCR_FIELDY &&
+       (unsigned int)(x - left) <= SCR_FIELDX))
+#endif
+  {
+#if 1
+    PlayLevelSound_EM(x, y, element, sample);
+#else
+    play[sample] = 1;
+    play_x[sample] = x;
+    play_y[sample] = y;
+    play_element[sample] = element;
+#endif
+  }
+}
+
+void play_sound(int x, int y, int sample)
+{
+  play_element_sound(x, y, sample, -1);
+}
+
 void sound_play(void)
 {
+  if (!use_native_em_sound)
+  {
+    int i;
+
+#if 0
+    UpdateEngineValues(screen_x / TILEX, screen_y / TILEY);
+#endif
+
+    return;
+
+    for (i = 0; i < SAMPLE_MAX; i++)
+      if (play[i])
+	PlayLevelSound_EM(play_x[i], play_y[i], play_element[i], i);
+  }
+
 #if defined(AUDIO_UNIX_NATIVE)
-  if (sound_pipe[1] != -1)
+  if (use_native_em_sound && sound_pipe[1] != -1)
   {
     if (write(sound_pipe[1], &play, sizeof(play)) == -1)
     {
@@ -243,6 +346,7 @@ void sound_play(void)
     }
   }
 
-  memset(play, 0, sizeof(play));
 #endif
+
+  memset(play, 0, sizeof(play));
 }