renamed variable

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

diff --git a/src/game_em/init.c b/src/game_em/init.c
index 8876c9527ee758993e0fc1ba70cb881769547cc7..8be34d401503e144c1dd830f22dbf0e4cc2377cb 100644 (file)
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -5,19 +5,12 @@
 
 #include "main_em.h"
 
-#include <signal.h>
-
 
 Bitmap *screenBitmap;
 
 struct GlobalInfo_EM global_em_info;
 struct GameInfo_EM game_em;
 
-int open_all(void)
-{
-  return 0;
-}
-
 void InitGfxBuffers_EM(void)
 {
   ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY);
@@ -27,14 +20,7 @@ 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");
-
-  /* after "open_all()", because we need the graphic bitmaps to be defined */
-  tab_generate_graphics_info_em();
+  InitGraphicInfo_EM();
 
   game_init_random();
   game_init_cave_buffers();
@@ -46,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);
@@ -66,13 +49,13 @@ unsigned int InitEngineRandom_EM(int seed)
     int simple_rnd = GetSimpleRandom(1000);
     int i;
 
-    for (i = 0; i < simple_rnd || RandomEM == NEW_RANDOMIZE; i++)
-      RandomEM = RandomEM * 129 + 1;
+    for (i = 0; i < simple_rnd || game_em.random == NEW_RANDOMIZE; i++)
+      game_em.random = game_em.random * 129 + 1;
 
-    seed = RandomEM;
+    seed = game_em.random;
   }
 
-  RandomEM = seed;
+  game_em.random = seed;
 
-  return (unsigned int) seed;
+  return (unsigned int)seed;
 }