Merge branch 'master' into releases

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

diff --git a/src/game_em/input.c b/src/game_em/input.c
index b54f5526f810ab557f9395b0880c9c5b9eafdade..0dd2bb3b95f99f1621b0d1c426a09a28c690fcb5 100644 (file)
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -3,9 +3,7 @@
  * handle input from x11 and keyboard and joystick
  */
 
-#include "global.h"
-#include "display.h"
-#include "level.h"
+#include "main_em.h"
 
 
 unsigned long RandomEM;
@@ -64,14 +62,43 @@ void InitGameEngine_EM()
 
   game_initscreen();
   game_animscreen();
+
+#if 0
+  /* blit playfield from scroll buffer to normal back buffer for fading in */
+  BlitScreenToBitmap_EM(backbuffer);
+#endif
 }
 
 void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 {
   int i;
 
+#if 0
+  static int foo = -1;
+
+  if (action[0] == 0 && foo != 0)
+    printf("KEY RELEASED @ %05d\n", FrameCounter);
+
+  foo = action[0];
+#endif
+
+#if 0
+#if 1
+  if (FrameCounter % 10 == 0)
+#endif
+    printf("::: %05d: %lu, %d\n", FrameCounter, RandomEM, frame);
+#endif
+
   game_animscreen();
 
+#if 1
+#if 0
+  SyncDisplay();
+#endif
+
+  blitscreen();
+#endif
+
   RandomEM = RandomEM * 129 + 1;
 
   frame = (frame - 1) & 7;