X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finput.c;h=62b25f550034231bc1962eef11b26ffdf16cdd62;hb=ec36fe263402351ac67b70400f11096a044365fe;hp=86feeb4d3e54acfaf7d3281ceb3ad85a183c3330;hpb=2362e426463cb445e119a4e3e5ce0b6ccb3fb33c;p=rocksndiamonds.git

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 86feeb4d..62b25f55 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -3,33 +3,17 @@
  * handle input from x11 and keyboard and joystick
  */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
 #include "global.h"
 #include "display.h"
 #include "level.h"
 
 
-#if defined(TARGET_X11)
-
 unsigned long Random;
 
 struct PLAYER ply1;
 struct PLAYER ply2;
 struct LEVEL lev;
 
-struct LevelInfo_EM native_em_level;
-
 unsigned short **Boom;
 unsigned short **Cave;
 unsigned short **Next;
@@ -38,6 +22,9 @@ unsigned short **Draw;
 static unsigned short *Index[4][HEIGHT];
 static unsigned short Array[4][HEIGHT][WIDTH];
 
+extern unsigned int screen_x;
+extern unsigned int screen_y;
+
 void game_init_vars(void)
 {
   int x, y;
@@ -82,7 +69,19 @@ void InitGameEngine_EM()
 
 void GameActions_EM(byte action)
 {
-  input_eventloop();
+  static unsigned long game_frame_delay = 0;
+#if 1
+  unsigned long game_frame_delay_value = getGameFrameDelay_EM(20);
+#else
+  unsigned long game_frame_delay_value = getGameFrameDelay_EM(25);
+#endif
+
+#if 0
+  /* this is done in screens.c/HandleGameActions() by calling BackToFront() */
+  XSync(display, False);	/* block until all graphics are drawn */
+#endif
+
+  WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value);
 
   game_animscreen();
 
@@ -92,6 +91,8 @@ void GameActions_EM(byte action)
 
   readjoy(action);
 
+  UpdateEngineValues(screen_x / TILEX, screen_y / TILEY);
+
   if (frame == 7)
   {
     synchro_1();
@@ -103,8 +104,8 @@ void GameActions_EM(byte action)
     synchro_3();
     sound_play();
 
-    DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score,
-			  (lev.time + 4) / 5);
+    if (game_frame_delay_value > 0)	/* do not redraw values in warp mode */
+      DrawGameDoorValues_EM();
   }
 }
 
@@ -113,7 +114,8 @@ void GameActions_EM(byte action)
 
 void readjoy(byte action)
 {
-  unsigned int north = 0, east = 0, south = 0, west = 0, fire = 0;
+  unsigned int north = 0, east = 0, south = 0, west = 0;
+  unsigned int snap = 0, drop = 0;
 
   if (action & JOY_LEFT)
     west = 1;
@@ -128,9 +130,14 @@ void readjoy(byte action)
     south = 1;
 
   if (action & JOY_BUTTON_1)
-    fire = 1;
+    snap = 1;
 
-  ply1.joy_fire = fire;
+  if (action & JOY_BUTTON_2)
+    drop = 1;
+
+#if 1
+  ply1.joy_snap = snap;
+  ply1.joy_drop = drop;
   if (ply1.joy_stick || (north | east | south | west))
   {
     ply1.joy_n = north;
@@ -138,37 +145,17 @@ void readjoy(byte action)
     ply1.joy_s = south;
     ply1.joy_w = west;
   }
-}
 
+#else
 
-/* handle events from x windows and block until the next frame */
-
-void input_eventloop(void)
-{
-  static struct timeval tv1 = { 0, 0 };
-  static struct timeval tv2 = { 0, 0 };
-  unsigned long count;
-
-  XSync(display, False); /* block until all graphics are drawn */
-
-  if (gettimeofday(&tv2, 0) == -1)
-    tv2.tv_usec = 0;
-
-  count = tv2.tv_usec + 1000000 - tv1.tv_usec;
-  if (count >= 1000000)
-    count -= 1000000;
-
-  tv1.tv_usec = tv2.tv_usec;
-  if (count < 25000)
+  ply2.joy_snap = snap;
+  ply2.joy_drop = drop;
+  if (ply2.joy_stick || (north | east | south | west))
   {
-    tv2.tv_sec = 0;
-    tv2.tv_usec = 25000 - count;
-#if 1
-    select(0, 0, 0, 0, &tv2); /* sleep a bit */
-#else
-    usleep(tv2.tv_usec);
-#endif
+    ply2.joy_n = north;
+    ply2.joy_e = east;
+    ply2.joy_s = south;
+    ply2.joy_w = west;
   }
-}
-
 #endif
+}