rnd-20060319-2-src

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

diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index 1fe8faf0a99382bd7180381da190f358ffe2025f..38607713370c2cf3e6e136aefc48e8dabd85d2ae 100644 (file)
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -5,13 +5,13 @@
  * large switch statement for tiles the player interacts with.
  */
 
-#include "tile.h"
-#include "level.h"
-#include "sample.h"
-#include "display.h"
+#include "main_em.h"
 
 
+#if 0
 extern int centered_player_nr;
+#endif
+
 extern boolean checkIfAllPlayersFitToScreen();
 
 static void check_player(struct PLAYER *);
@@ -449,6 +449,8 @@ static void check_player(struct PLAYER *ply)
   int anim = 0;
   int dx = 0, dy = 0;
 
+  game_em.last_player_direction[ply->num] = MV_NONE;
+
 #if 0
   printf("::: up == %d, down == %d, left == %d, right == %d, fire == %d [spin == %d, stick == %d]\n",
         ply->joy_n, ply->joy_s, ply->joy_w, ply->joy_e, ply->joy_fire,
@@ -551,7 +553,8 @@ static void check_player(struct PLAYER *ply)
     ply->x = x;
     ply->y = y;
 
-    can_move = (centered_player_nr != -1 || checkIfAllPlayersFitToScreen());
+    can_move = (game.centered_player_nr != -1 ||
+               checkIfAllPlayersFitToScreen());
 
     ply->x = oldx;
     ply->y = oldy;