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

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 86feeb4d..353b36ee 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -3,46 +3,30 @@
  * 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 "main_em.h"
 
-#include "global.h"
-#include "display.h"
-#include "level.h"
 
+unsigned long RandomEM;
 
-#if defined(TARGET_X11)
-
-unsigned long Random;
-
-struct PLAYER ply1;
-struct PLAYER ply2;
 struct LEVEL lev;
+struct PLAYER ply[MAX_PLAYERS];
 
-struct LevelInfo_EM native_em_level;
+short **Boom;
+short **Cave;
+short **Next;
+short **Draw;
 
-unsigned short **Boom;
-unsigned short **Cave;
-unsigned short **Next;
-unsigned short **Draw;
+static short *Index[4][HEIGHT];
+static short Array[4][HEIGHT][WIDTH];
 
-static unsigned short *Index[4][HEIGHT];
-static unsigned short Array[4][HEIGHT][WIDTH];
+extern int screen_x;
+extern int screen_y;
 
 void game_init_vars(void)
 {
   int x, y;
 
-  Random = 1684108901;
+  RandomEM = 1684108901;
 
   for (y = 0; y < HEIGHT; y++)
     for (x = 0; x < WIDTH; x++)
@@ -80,17 +64,20 @@ void InitGameEngine_EM()
   game_animscreen();
 }
 
-void GameActions_EM(byte action)
+void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 {
-  input_eventloop();
+  int i;
 
   game_animscreen();
 
-  Random = Random * 129 + 1;
+  RandomEM = RandomEM * 129 + 1;
 
   frame = (frame - 1) & 7;
 
-  readjoy(action);
+  for (i = 0; i < MAX_PLAYERS; i++)
+    readjoy(action[i], &ply[i]);
+
+  UpdateEngineValues(screen_x / TILEX, screen_y / TILEY);
 
   if (frame == 7)
   {
@@ -103,17 +90,17 @@ void GameActions_EM(byte action)
     synchro_3();
     sound_play();
 
-    DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score,
-			  (lev.time + 4) / 5);
+    if (!warp_mode)		/* do not redraw values in warp mode */
+      DrawGameDoorValues_EM();
   }
 }
 
-
 /* read input device for players */
 
-void readjoy(byte action)
+void readjoy(byte action, struct PLAYER *ply)
 {
-  unsigned int north = 0, east = 0, south = 0, west = 0, fire = 0;
+  int north = 0, east = 0, south = 0, west = 0;
+  int snap = 0, drop = 0;
 
   if (action & JOY_LEFT)
     west = 1;
@@ -128,47 +115,19 @@ void readjoy(byte action)
     south = 1;
 
   if (action & JOY_BUTTON_1)
-    fire = 1;
-
-  ply1.joy_fire = fire;
-  if (ply1.joy_stick || (north | east | south | west))
-  {
-    ply1.joy_n = north;
-    ply1.joy_e = east;
-    ply1.joy_s = south;
-    ply1.joy_w = west;
-  }
-}
-
+    snap = 1;
 
-/* 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;
+  if (action & JOY_BUTTON_2)
+    drop = 1;
 
-  XSync(display, False); /* block until all graphics are drawn */
+  ply->joy_snap = snap;
+  ply->joy_drop = drop;
 
-  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)
+  if (ply->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
+    ply->joy_n = north;
+    ply->joy_e = east;
+    ply->joy_s = south;
+    ply->joy_w = west;
   }
 }
-
-#endif