X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finit.c;h=9a3dadb8ebe962e9b65529cc5cf6460f656a5400;hb=86e1890b2d87dd7710b320e2b306c7291d41e2a5;hp=7f775a05322b586bf40a066a4f88e63bef26a70d;hpb=9583e9c55b889974e0df9a8ca1930efdf29bda29;p=rocksndiamonds.git

diff --git a/src/game_em/init.c b/src/game_em/init.c
index 7f775a05..9a3dadb8 100644
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -6,11 +6,12 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-#include "game_em.h"
+#include "main_em.h"
 
 #include "global.h"
 #include "display.h"
 #include "sample.h"
+#include "level.h"
 
 
 Bitmap *objBitmap;
@@ -33,6 +34,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,6 +44,8 @@ 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",
@@ -57,6 +63,7 @@ static const char *sound_names[SAMPLE_MAX] =
   "12.collect.au",
   "13.diamond.au",
   "14.squash.au",
+  "14.squash.au",
   "15.drip.au",
   "16.push.au",
   "17.dirt.au",
@@ -97,6 +104,7 @@ static const int sound_volume[SAMPLE_MAX] =
   100,
   100,
   100,
+  100,
   20,
   100,
   100,
@@ -114,6 +122,7 @@ char *progname;
 char *arg_basedir;
 
 extern void tab_generate();
+extern void tab_generate_graphics_info_em();
 extern void ulaw_generate();
 
 int open_all(void)
@@ -161,7 +170,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;
@@ -236,6 +245,9 @@ void em_open_all()
   if (open_all() != 0)
     Error(ERR_EXIT, "em_open_all(): open_all() failed");
 
+  /* after "open_all()", because we need the graphic bitmaps to be defined */
+  tab_generate_graphics_info_em();
+
   game_init_vars();
 }
 
@@ -274,38 +286,52 @@ void em_close_all(void)
 extern unsigned int screen_x;
 extern unsigned int screen_y;
 
-void play_sound(int x, int y, int sample)
+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 0
-  if (x == -1 && y == -1)	/* play sound in the middle of the screen */
-    play[sample] = 0xffff;
-  else if ((unsigned int)(y - top)  <= SCR_FIELDY &&
-	   (unsigned int)(x - left) <= SCR_FIELDX)
-    play[sample] = (y << 8) | (x & 0xff);
-#else
   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
-  int i;
+    UpdateEngineValues(screen_x / TILEX, screen_y / TILEY);
+#endif
 
-  for (i = 0; i < SAMPLE_MAX; i++)
-    if (play[i])
-      PlayLevelSound_EM(0,0,0,0);
+    return;
 
-#else
+    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)
     {
@@ -324,8 +350,26 @@ void sound_play(void)
       }
     }
   }
-#endif
+
 #endif
 
   memset(play, 0, sizeof(play));
 }
+
+unsigned int InitEngineRND_EM(long seed)
+{
+  if (seed == NEW_RANDOMIZE)
+  {
+    int simple_rnd = SimpleRND(1000);
+    int i;
+
+    for (i = 0; i < simple_rnd || Random == NEW_RANDOMIZE; i++)
+      Random = Random * 129 + 1;
+
+    seed = Random;
+  }
+
+  Random = seed;
+
+  return (unsigned int) seed;
+}