rnd-20140515-2-src

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

diff --git a/src/game_em/init.c b/src/game_em/init.c
index f2f074a796a8b9133d9d8df9efb4a116be6f4830..3aa8361d4b600888d025b27791889a6f74e270da 100644 (file)
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -3,18 +3,9 @@
  * open X11 display and sound
  */
 
-#include <signal.h>
-
-#if !defined(TARGET_SDL)
-#include <sys/wait.h>
-#endif
-
 #include "main_em.h"
 
-#include "global.h"
-#include "display.h"
-#include "sample.h"
-#include "level.h"
+#include <signal.h>
 
 
 Bitmap *objBitmap;
@@ -44,12 +35,13 @@ int play_element[SAMPLE_MAX];
 static boolean use_native_em_sound = 0;
 
 struct GlobalInfo_EM global_em_info;
+struct GameInfo_EM game_em;
 
 #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 */
+int sound_length[SAMPLE_MAX];          /* length of sound data */
 
 static const char *sound_names[SAMPLE_MAX] =
 {
@@ -157,10 +149,15 @@ int open_all(void)
   sprmaskBitmap = emc_bitmaps[1]->clip_mask;
 #endif
 
+#if 0
+  printf("::: CreateBitmap: %d, %d => %d\n",
+        MAX_BUF_XSIZE, TILEX, MAX_BUF_XSIZE * TILEX);
+
   screenBitmap = CreateBitmap(MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY,
                              DEFAULT_DEPTH);
 
   global_em_info.screenbuffer = screenBitmap;
+#endif
 
 #endif
 
@@ -248,6 +245,33 @@ int open_all(void)
   return(0);
 }
 
+void InitGfxBuffers_EM()
+{
+
+#if 1
+
+#if 0
+  printf("::: InitGfxBuffers_EM: %d, %d => %d\n",
+        MAX_BUF_XSIZE, TILEX, MAX_BUF_XSIZE * TILEX);
+#endif
+
+  ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY,
+                DEFAULT_DEPTH);
+
+  global_em_info.screenbuffer = screenBitmap;
+
+#else
+
+  printf("::: CreateBitmap: %d, %d => %d\n",
+        MAX_BUF_XSIZE, TILEX, MAX_BUF_XSIZE * TILEX);
+
+  screenBitmap = CreateBitmap(MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY,
+                             DEFAULT_DEPTH);
+
+  global_em_info.screenbuffer = screenBitmap;
+#endif
+}
+
 void em_open_all()
 {
   /* pre-calculate some data */
@@ -369,14 +393,14 @@ void sound_play(void)
 
 #endif
 
-  memset(play, 0, sizeof(play));
+  clear_mem(play, sizeof(play));
 }
 
-unsigned int InitEngineRND_EM(long seed)
+unsigned int InitEngineRandom_EM(int seed)
 {
   if (seed == NEW_RANDOMIZE)
   {
-    int simple_rnd = SimpleRND(1000);
+    int simple_rnd = GetSimpleRandom(1000);
     int i;
 
     for (i = 0; i < simple_rnd || RandomEM == NEW_RANDOMIZE; i++)