X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finit.c;h=c99cb8e746384745e54f5f3c15ad22d4d29f03bf;hb=f717d0c1;hp=9937110a8a80808cda87047659324bca926ee5cb;hpb=3923ae9a33cceaf73cd7911b0c7d6abc18b3663b;p=rocksndiamonds.git

diff --git a/src/game_em/init.c b/src/game_em/init.c
index 9937110a..c99cb8e7 100644
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -5,29 +5,12 @@
 
 #include "main_em.h"
 
-#include <signal.h>
-
-
-Bitmap *objBitmap;
-Bitmap *sprBitmap;
 
 Bitmap *screenBitmap;
 
 struct GlobalInfo_EM global_em_info;
 struct GameInfo_EM game_em;
 
-int open_all(void)
-{
-  Bitmap *emc_bitmaps[2];
-
-  SetBitmaps_EM(emc_bitmaps);
-
-  objBitmap = emc_bitmaps[0];
-  sprBitmap = emc_bitmaps[1];
-
-  return 0;
-}
-
 void InitGfxBuffers_EM(void)
 {
   ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY);
@@ -37,16 +20,10 @@ void InitGfxBuffers_EM(void)
 
 void em_open_all(void)
 {
-  /* pre-calculate some data */
-  tab_generate();
-
-  if (open_all() != 0)
-    Error(ERR_EXIT, "em_open_all(): open_all() failed");
+  InitGraphicInfo_EM();
 
-  /* after "open_all()", because we need the graphic bitmaps to be defined */
-  tab_generate_graphics_info_em();
-
-  game_init_vars();
+  game_init_random();
+  game_init_cave_buffers();
 }
 
 void em_close_all(void)
@@ -55,9 +32,6 @@ void em_close_all(void)
 
 /* ---------------------------------------------------------------------- */
 
-extern int screen_x;
-extern int screen_y;
-
 void play_element_sound(int x, int y, int sample, int element)
 {
   PlayLevelSound_EM(x, y, element, sample);