rnd-20060816-2-src

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

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 79efd2f93eeceb0379f412e81c1da31930bffcca..2c6c1faacfb498d0ecbebba05a8f95934166f57b 100644 (file)
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -3,35 +3,30 @@
  * handle input from x11 and keyboard and joystick
  */
 
-#include "global.h"
-#include "display.h"
-#include "level.h"
+#include "main_em.h"
 
 
-unsigned long Random;
+unsigned long RandomEM;
 
-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 unsigned int screen_x;
-extern unsigned int screen_y;
+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++)
@@ -67,27 +62,31 @@ void InitGameEngine_EM()
 
   game_initscreen();
   game_animscreen();
+
+  /* blit playfield from scroll buffer to back buffer for fading in */
+  BlitScreenToBitmap_EM(backbuffer);
 }
 
-void GameActions_EM(byte action)
+void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 {
-  static unsigned long game_frame_delay = 0;
-  unsigned long game_frame_delay_value = getGameFrameDelay_EM(25);
+  int i;
 
-#if 0
-  /* this is done in screens.c/HandleGameActions() by calling BackToFront() */
-  XSync(display, False);       /* block until all graphics are drawn */
-#endif
+  game_animscreen();
 
-  WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value);
+#if 1
+  SyncDisplay();
 
-  game_animscreen();
+  blitscreen();
 
-  Random = Random * 129 + 1;
+  FlushDisplay();
+#endif
+
+  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);
 
@@ -102,17 +101,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;
@@ -127,14 +126,19 @@ void readjoy(byte action)
     south = 1;
 
   if (action & JOY_BUTTON_1)
-    fire = 1;
+    snap = 1;
+
+  if (action & JOY_BUTTON_2)
+    drop = 1;
+
+  ply->joy_snap = snap;
+  ply->joy_drop = drop;
 
-  ply1.joy_fire = fire;
-  if (ply1.joy_stick || (north | east | south | west))
+  if (ply->joy_stick || (north | east | south | west))
   {
-    ply1.joy_n = north;
-    ply1.joy_e = east;
-    ply1.joy_s = south;
-    ply1.joy_w = west;
+    ply->joy_n = north;
+    ply->joy_e = east;
+    ply->joy_s = south;
+    ply->joy_w = west;
   }
 }