X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finput.c;h=79efd2f93eeceb0379f412e81c1da31930bffcca;hb=f47cd4b09952aaf95d16542f6b53f2d8bf9e1d7d;hp=207a80baf74f71c9810aa52e23aa871144d64d23;hpb=b19246464046dd481ab0e9bd133ba09b9d0b0300;p=rocksndiamonds.git

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 207a80ba..79efd2f9 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -3,31 +3,19 @@
  * 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;
@@ -36,79 +24,8 @@ unsigned short **Draw;
 static unsigned short *Index[4][HEIGHT];
 static unsigned short Array[4][HEIGHT][WIDTH];
 
-static int input_die;
-static int input_pause;
-static int input_refresh;
-static int input_esc;
-
-static struct timeval tv1;
-static struct timeval tv2;
-
-static unsigned char keymatrix[32];
-
-static int player_mode;
-static char player_name[32];
-static int player_level;
-
-static void drawmenu(int pos)
-{
-  char buffer[256];
-
-  switch(pos)
-  {
-    case 0:
-      switch(player_mode)
-      {
-        case 0:
-	  strcpy(buffer, "quit emerald mine");
-	  break;
-
-        case 1:
-	  strcpy(buffer, "single player");
-	  break;
-
-        case 2:
-	  strcpy(buffer, "teamwork");
-	  break;
-      }
-
-      title_string(4, 0, 40, buffer);
-      break;
-
-    case 1:
-      sprintf(buffer, "name: %s", player_name);
-      title_string(5, 0, 40, buffer);
-      break;
-
-    case 2:
-      sprintf(buffer, "level: %d", player_level);
-      title_string(6, 0, 40, buffer);
-      break;
-
-    case 3:
-      title_string(7, 0, 40, "highscores");
-      break;
-
-    case 4:
-      title_string(8, 0, 40, "start");
-      break;
-
-    case 5:
-      title_string(10, 3, 13, "played");
-      title_string(10, 14, 26, "score");
-      title_string(10, 27, 37, "won");
-      break;
-
-    case 6:
-      sprintf(buffer, "%d", 0);
-      title_string(11, 3, 13, buffer);
-      sprintf(buffer, "%d", 0);
-      title_string(11, 14, 26, buffer);
-      sprintf(buffer, "%d", 0);
-      title_string(11, 27, 37, buffer);
-      break;
-  }
-}
+extern unsigned int screen_x;
+extern unsigned int screen_y;
 
 void game_init_vars(void)
 {
@@ -142,241 +59,61 @@ void game_init_vars(void)
   Next = Index[1];
   Draw = Index[2];
   Boom = Index[3];
-
-  player_mode = 1;			/* start off as single player */
-  strcpy(player_name, "dave");
-  player_level = 0;
-
-  input_pause = 1    * 0;
 }
 
-int game_play_init(int player_level)
+void InitGameEngine_EM()
 {
-  char name[MAXNAME+2];
-
-  name[MAXNAME] = 0;
-  snprintf(name, MAXNAME+2, "%s/lev%02d", EM_LVL_DIR, player_level);
-
-  if (name[MAXNAME])
-    snprintf_overflow("read a level in cave/");
-
-  if (cave_convert(name) != 0)
-    return 1;
+  prepare_em_level();
 
   game_initscreen();
-  game_blitscore();
   game_animscreen();
-
-  return 0;
-}
-
-int game_menu_loop(boolean init, byte action)
-{
-  static int temp = -1;
-  static int pos = -1;
-
-  if (init)
-  {
-    temp = 1;
-    pos = 4;
-
-    return 0;
-  }
-
-  input_eventloop();
-
-  if (input_die)
-    return 1;
-
-  if (input_refresh)
-    blitscreen();
-
-  if (!input_pause)
-  {
-    title_blitants(4 + pos);
-    title_blitscore();
-    title_animscreen();
-
-    ply1.joy_n = ply1.joy_e = ply1.joy_s = ply1.joy_w = 0;
-
-    readjoy(action);
-
-    if (temp == 0)
-    {
-      if (ply1.joy_fire)
-	return 2;
-
-      if (ply1.joy_e && player_level < 99)
-      {
-	player_level++;
-	drawmenu(2);
-      }
-
-      if (ply1.joy_w && player_level > 0)
-      {
-	player_level--;
-	drawmenu(2);
-      }
-
-      if (ply1.joy_n && pos > 0)
-      {
-	drawmenu(pos);
-	pos--;
-	title_blitants(4 + pos);
-      }
-
-      if (ply1.joy_s && pos < 4)
-      {
-	drawmenu(pos);
-	pos++;
-	title_blitants(4 + pos);
-      }
-    }
-
-    temp = (ply1.joy_n || ply1.joy_e || ply1.joy_s || ply1.joy_w ||
-	    ply1.joy_fire);
-  }
-
-  return 0;
-}
-
-int game_play_loop(byte action)
-{
-  input_eventloop();
-
-  if (input_die || input_esc)
-    return 1;
-
-  if (input_refresh)
-    blitscreen();
-
-  if (!input_pause)
-  {
-    game_animscreen();
-
-    frame = (frame - 1) & 7;
-
-    readjoy(action);
-
-#if 1
-    if (input_esc)
-      return 1;
-#endif
-
-    if (frame == 7)
-    {
-      synchro_1();
-      synchro_2();
-    }
-
-    if (frame == 6)
-    {
-      synchro_3();
-      sound_play();
-      game_blitscore();
-    }
-  }
-
-  return 0;
-}
-
-void game_menu_init(void)
-{
-  int pos = 4;
-  int i;
-
-  title_initscreen();
-
-  for (i = 0; i < 7; i++)
-    drawmenu(i);			/* display all lines */
-
-  title_blitants(4 + pos);
-  title_blitscore();
-  title_animscreen();
-
-  game_menu_loop(1, 0);
 }
 
-int game_loop(byte action)
+void GameActions_EM(byte action)
 {
-#if 1
+  static unsigned long game_frame_delay = 0;
+  unsigned long game_frame_delay_value = getGameFrameDelay_EM(25);
 
 #if 0
-  printf("::: action == 0x%02x\n", action);
+  /* this is done in screens.c/HandleGameActions() by calling BackToFront() */
+  XSync(display, False);	/* block until all graphics are drawn */
 #endif
 
-  if (em_game_status == EM_GAME_STATUS_MENU)
-  {
-    int result = game_menu_loop(0, action);
+  WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value);
 
-    if (result == 1)
-    {
-      /* exit program */
+  game_animscreen();
 
-      return 1;
-    }
+  Random = Random * 129 + 1;
 
-    if (result == 2)
-    {
-      /* start playing */
+  frame = (frame - 1) & 7;
 
-      em_game_status = EM_GAME_STATUS_PLAY;
-      if (game_play_init(player_level) != 0)
-	em_game_status = EM_GAME_STATUS_MENU;
-    }
-  }
-  else if (em_game_status == EM_GAME_STATUS_PLAY)
-  {
-    if (game_play_loop(action) != 0)
-    {
-      /* stop playing */
-
-      em_game_status = EM_GAME_STATUS_MENU;
-      game_menu_init();
-    }
-  }
+  readjoy(action);
 
-  return 0;
+  UpdateEngineValues(screen_x / TILEX, screen_y / TILEY);
 
-#else
-
-  while (1)
+  if (frame == 7)
   {
-    int result = game_menu_loop(0);
-
-    if (result == 1)
-      return 1;
-
-    if (result == 2)
-      break;
+    synchro_1();
+    synchro_2();
   }
 
-  em_game_status = EM_GAME_STATUS_PLAY;
-  if (game_play_init(player_level) != 0)
-    return 0;
-
-  while (1)
+  if (frame == 6)
   {
-    if (game_play_loop() != 0)
-      break;
-  }
+    synchro_3();
+    sound_play();
 
-  em_game_status = EM_GAME_STATUS_MENU;
-  game_menu_init();
+    DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score,
+			  (lev.time + 4) / 5);
+  }
+}
 
-  return 0;
 
-#endif
-}
+/* read input device for players */
 
-/* read input device for players
- */
 void readjoy(byte action)
 {
   unsigned int north = 0, east = 0, south = 0, west = 0, fire = 0;
 
-#if 1
-
   if (action & JOY_LEFT)
     west = 1;
 
@@ -392,34 +129,6 @@ void readjoy(byte action)
   if (action & JOY_BUTTON_1)
     fire = 1;
 
-  if (action & JOY_BUTTON_2)
-    input_esc = 1;
-
-#else
-
-  unsigned int i;
-
-  for (i = 0; i < 3; i++)
-    if (keymatrix[northKeyCode[i] >> 3] & 1 << (northKeyCode[i] & 7))
-      north = 1;
-
-  for (i = 0; i < 3; i++)
-    if (keymatrix[eastKeyCode[i] >> 3] & 1 << (eastKeyCode[i] & 7))
-      east = 1;
-
-  for (i = 0; i < 3; i++)
-    if (keymatrix[southKeyCode[i] >> 3] & 1 << (southKeyCode[i] & 7))
-      south = 1;
-
-  for (i = 0; i < 3; i++)
-    if (keymatrix[westKeyCode[i] >> 3] & 1 << (westKeyCode[i] & 7))
-      west = 1;
-
-  for (i = 0; i < 3; i++)
-    if (keymatrix[fireKeyCode[i] >> 3] & 1 << (fireKeyCode[i] & 7))
-      fire = 1;
-#endif
-
   ply1.joy_fire = fire;
   if (ply1.joy_stick || (north | east | south | west))
   {
@@ -429,96 +138,3 @@ void readjoy(byte action)
     ply1.joy_w = west;
   }
 }
-
-/* handle events from x windows and block until the next frame
- */
-void input_eventloop(void)
-{
-#if 0
-  XEvent event;
-#endif
-  unsigned int i;
-  unsigned long count;
-
-  if (input_pause)
-  {
-#if 0
-    XPeekEvent(display, &event); /* block until an event arrives */
-
-    if (gettimeofday(&tv1, 0) == -1)
-      tv1.tv_usec = 0;
-#endif
-  }
-  else
-  {
-    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)
-    {
-      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
-    }
-  }
-
-  input_die = 0;
-  input_refresh = 0;
-  lastKeySym = NoSymbol;
-
-#if 0
-  while (XPending(display))
-  {
-    /* drain the event queue */
-    XNextEvent(display, &event);
-
-    switch(event.xany.type)
-    {
-      case KeyPress:
-	XLookupString(&event.xkey, (char *)&count, 1, &lastKeySym, 0);
-	break;
-
-      case Expose:
-	if (event.xexpose.window == xwindow && event.xexpose.count == 0)
-	  input_refresh = 1;
-	break;
-
-      case ClientMessage:
-	if (event.xclient.window == xwindow &&
-	    (Atom)event.xclient.data.l[0] == deleteAtom)
-	  input_die = 1;
-	break;
-
-      case EnterNotify:
-	if (event.xcrossing.window == xwindow)
-	  input_pause = 0;
-	break;
-
-      case LeaveNotify:
-	if (event.xcrossing.window == xwindow)
-	  input_pause = 1;
-	break;
-    }
-  }
-
-  XQueryKeymap(display, keymatrix); /* read the keyboard */
-#endif
-
-  input_esc = 0;
-  for (i = 0; i < 1; i++)
-    if (keymatrix[escKeyCode[i] >> 3] & 1 << (escKeyCode[i] & 7))
-      input_esc = 1;
-}
-
-#endif