X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finput.c;h=6eadbbdf0d2ca4aec9d50b6442e9270659aab066;hb=739004ae2f6fa8b334b040760486b9689d8f59da;hp=1df150a898179999f9f0528e7d5676cfdc7ed914;hpb=dd04ac635e8722c7f5de3b34fec011925b33808f;p=rocksndiamonds.git

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 1df150a8..6eadbbdf 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -6,19 +6,15 @@
 #include "main_em.h"
 
 
-unsigned int RandomEM;
-
-struct LEVEL lev;
+struct CAVE cav;
+struct LOGIC lev;
 struct PLAYER ply[MAX_PLAYERS];
 
-extern int screen_x;
-extern int screen_y;
-
 struct EngineSnapshotInfo_EM engine_snapshot_em;
 
 void game_init_random(void)
 {
-  RandomEM = 1684108901;
+  game_em.random = 1684108901;
 }
 
 void game_init_cave_buffers(void)
@@ -71,7 +67,7 @@ void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
   int i;
   boolean any_player_dropping = FALSE;
 
-  RandomEM = RandomEM * 129 + 1;
+  game_em.random = game_em.random * 129 + 1;
 
   frame = (frame - 1) & 7;
 
@@ -82,13 +78,13 @@ void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 
   if (frame == 7)
   {
-    logic_1();
-    logic_2();
+    logic_players();
+    logic_objects();
   }
 
   if (frame == 6)
   {
-    logic_3();
+    logic_globals();
 
     UpdateGameDoorValues_EM();
   }
@@ -168,9 +164,7 @@ void SaveEngineSnapshotValues_EM(void)
   engine_snapshot_em.game_em = game_em;
   engine_snapshot_em.lev = lev;
 
-  engine_snapshot_em.RandomEM = RandomEM;
   engine_snapshot_em.frame = frame;
-
   engine_snapshot_em.screen_x = screen_x;
   engine_snapshot_em.screen_y = screen_y;
 
@@ -185,9 +179,7 @@ void LoadEngineSnapshotValues_EM(void)
   game_em = engine_snapshot_em.game_em;
   lev = engine_snapshot_em.lev;
 
-  RandomEM = engine_snapshot_em.RandomEM;
   frame = engine_snapshot_em.frame;
-
   screen_x = engine_snapshot_em.screen_x;
   screen_y = engine_snapshot_em.screen_y;