changed order of some structures in EM engine

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

diff --git a/src/game_em/game.c b/src/game_em/game.c
index fd344add7c107c033d5b92d260b4745d0cd71b1a..7842a89c5dd7b0b0ad69f897386c4caa5dfcfed0 100644 (file)
--- a/src/game_em/game.c
+++ b/src/game_em/game.c
@@ -76,10 +76,6 @@ void InitGameEngine_EM(void)
   RedrawPlayfield_EM(FALSE);
 }
 
-static void UpdateGameDoorValues_EM(void)
-{
-}
-
 void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 {
   int i;
@@ -87,25 +83,14 @@ void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 
   game_em.random = game_em.random * 129 + 1;
 
-  frame = (frame - 1) & 7;
+  frame = (frame + 1) % 8;
 
   for (i = 0; i < MAX_PLAYERS; i++)
     readjoy(action[i], &ply[i]);
 
   UpdateEngineValues(screen_x / TILEX, screen_y / TILEY, ply[0].x, ply[0].y);
 
-  if (frame == 7)
-  {
-    logic_players();
-    logic_objects();
-  }
-
-  if (frame == 6)
-  {
-    logic_globals();
-
-    UpdateGameDoorValues_EM();
-  }
+  logic();
 
   for (i = 0; i < MAX_PLAYERS; i++)
     if (ply[i].joy_drop &&