rnd-20050103-1-src

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

diff --git a/src/game_em/init.c b/src/game_em/init.c
index 46c4ee0972427107e72a1968f6f955516206c95c..42117321e902bf5a0cf88236b7dd1e02fce73cb5 100644 (file)
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -4,9 +4,12 @@
  */
 
 #include <signal.h>
+
+#if !defined(TARGET_SDL)
 #include <sys/wait.h>
+#endif
 
-#include "game_em.h"
+#include "main_em.h"
 
 #include "global.h"
 #include "display.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",
@@ -122,6 +127,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)
@@ -147,6 +153,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
@@ -237,13 +246,18 @@ void em_open_all()
 {
   /* pre-calculate some data */
   tab_generate();
+#if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD)
   ulaw_generate();
+#endif
 
   progname = "emerald mine";
 
   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();
 }