added separate initial and runtime level structure definitions for EM engine

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

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 1df150a898179999f9f0528e7d5676cfdc7ed914..7eccf546178f894186ff1f0e9240cbcc70708e9e 100644 (file)
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -8,7 +8,8 @@
 
 unsigned int RandomEM;
 
-struct LEVEL lev;
+struct CAVE cav;
+struct LOGIC lev;
 struct PLAYER ply[MAX_PLAYERS];
 
 extern int screen_x;
@@ -82,13 +83,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();
   }