rnd-20060207-3-src

[rocksndiamonds.git] / src / game_em / init.c

diff --git a/src/game_em/init.c b/src/game_em/init.c
index 9a3dadb8ebe962e9b65529cc5cf6460f656a5400..54759eefbe5a12ca785365e6fca8817e1a079f58 100644 (file)
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -4,7 +4,10 @@
  */
 
 #include <signal.h>
+
+#if !defined(TARGET_SDL)
 #include <sys/wait.h>
+#endif
 
 #include "main_em.h"
 
@@ -38,14 +41,16 @@ int play_x[SAMPLE_MAX];
 int play_y[SAMPLE_MAX];
 int play_element[SAMPLE_MAX];
 
+static boolean use_native_em_sound = 0;
+
+struct GlobalInfo_EM global_em_info;
+
 #if defined(AUDIO_UNIX_NATIVE)
 static int sound_pid = -1;
 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",
@@ -56,9 +61,11 @@ static const char *sound_names[SAMPLE_MAX] =
   "05.bug.au",
   "06.tank.au",
   "07.android.au",
+  "06.tank.au",                /* android moving */
   "08.spring.au",
   "09.slurp.au",
   "10.eater.au",
+  "10.eater.au",       /* eater eating */
   "11.alien.au",
   "12.collect.au",
   "13.diamond.au",
@@ -73,6 +80,7 @@ static const char *sound_names[SAMPLE_MAX] =
   "21.wonder.au",
   "22.door.au",
   "23.exit.au",
+  "23.exit.au",
   "24.dynamite.au",
   "25.tick.au",
   "26.press.au",
@@ -91,9 +99,11 @@ static const int sound_volume[SAMPLE_MAX] =
   20,
   20,
   100,
+  20,
   100,
   100,
   50,
+  50,
   100,
   100,
   100,
@@ -111,6 +121,7 @@ static const int sound_volume[SAMPLE_MAX] =
   100,
   100,
   100,
+  100,
   20,
   100,
   100,
@@ -148,6 +159,9 @@ int open_all(void)
 
   screenBitmap = CreateBitmap(MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY,
                              DEFAULT_DEPTH);
+
+  global_em_info.screenbuffer = screenBitmap;
+
 #endif
 
 #if 0
@@ -238,7 +252,9 @@ void em_open_all()
 {
   /* pre-calculate some data */
   tab_generate();
+#if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD)
   ulaw_generate();
+#endif
 
   progname = "emerald mine";
 
@@ -363,13 +379,13 @@ unsigned int InitEngineRND_EM(long seed)
     int simple_rnd = SimpleRND(1000);
     int i;
 
-    for (i = 0; i < simple_rnd || Random == NEW_RANDOMIZE; i++)
-      Random = Random * 129 + 1;
+    for (i = 0; i < simple_rnd || RandomEM == NEW_RANDOMIZE; i++)
+      RandomEM = RandomEM * 129 + 1;
 
-    seed = Random;
+    seed = RandomEM;
   }
 
-  Random = seed;
+  RandomEM = seed;
 
   return (unsigned int) seed;
 }