rnd-19981204-2
[rocksndiamonds.git] / src / events.c
index 02a13795d1573693e8dd55b6a7c89f1ad2267215..2d8eca3e861657b6442169036ac88d5395f08934 100644 (file)
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  events.c                                                *
 ***********************************************************/
 #include "misc.h"
 #include "tape.h"
 #include "joystick.h"
+#include "network.h"
+
+/* values for key_status */
+#define KEY_NOT_PRESSED                FALSE
+#define KEY_RELEASED           FALSE
+#define KEY_PRESSED            TRUE
 
 void EventLoop(void)
 {
   while(1)
   {
-    if (XPending(display))     /* got an event */
+    if (XPending(display))     /* got event from X server */
     {
       XEvent event;
 
@@ -34,46 +39,35 @@ void EventLoop(void)
 
       switch(event.type)
       {
-       case Expose:
-         HandleExposeEvent((XExposeEvent *) &event);
-         break;
-       case UnmapNotify:
-         SleepWhileUnmapped();
-         break;
        case ButtonPress:
        case ButtonRelease:
          HandleButtonEvent((XButtonEvent *) &event);
          break;
+
        case MotionNotify:
          HandleMotionEvent((XMotionEvent *) &event);
          break;
+
        case KeyPress:
        case KeyRelease:
          HandleKeyEvent((XKeyEvent *) &event);
          break;
-       case FocusIn:
-       case FocusOut:
-         HandleFocusEvent((XFocusChangeEvent *) &event);
-         break;
-        case ClientMessage:
-         HandleClientMessageEvent((XClientMessageEvent *) &event);
-         break;
+
        default:
+         HandleOtherEvents(&event);
          break;
       }
     }
-    else                       /* got no event, but don't be lazy... */
-    {
-      HandleNoXEvent();
 
-      /* don't use all CPU time when idle; the main loop while playing
-        has its own synchronization and is CPU friendly, too */
+    HandleNoXEvent();
 
-      if (game_status != PLAYING)
-      {
-       XSync(display, FALSE);
-       Delay(10);
-      }
+    /* don't use all CPU time when idle; the main loop while playing
+       has its own synchronization and is CPU friendly, too */
+
+    if (game_status != PLAYING)
+    {
+      XSync(display, FALSE);
+      Delay(10);
     }
 
     if (game_status == EXITGAME)
@@ -81,6 +75,32 @@ void EventLoop(void)
   }
 }
 
+void HandleOtherEvents(XEvent *event)
+{
+  switch(event->type)
+  {
+    case Expose:
+      HandleExposeEvent((XExposeEvent *) event);
+      break;
+
+    case UnmapNotify:
+      SleepWhileUnmapped();
+      break;
+
+    case FocusIn:
+    case FocusOut:
+      HandleFocusEvent((XFocusChangeEvent *) event);
+      break;
+
+    case ClientMessage:
+      HandleClientMessageEvent((XClientMessageEvent *) event);
+      break;
+
+    default:
+      break;
+  }
+}
+
 void ClearEventQueue()
 {
   while(XPending(display))
@@ -91,26 +111,16 @@ void ClearEventQueue()
 
     switch(event.type)
     {
-      case Expose:
-        HandleExposeEvent((XExposeEvent *) &event);
-       break;
-      case UnmapNotify:
-       SleepWhileUnmapped();
-       break;
       case ButtonRelease:
        button_status = MB_RELEASED;
        break;
+
       case KeyRelease:
        key_joystick_mapping = 0;
        break;
-      case FocusIn:
-      case FocusOut:
-       HandleFocusEvent((XFocusChangeEvent *) &event);
-       break;
-      case ClientMessage:
-       HandleClientMessageEvent((XClientMessageEvent *) &event);
-       break;
+
       default:
+       HandleOtherEvents(&event);
        break;
     }
   }
@@ -118,7 +128,7 @@ void ClearEventQueue()
 
 void SleepWhileUnmapped()
 {
-  BOOL window_unmapped = TRUE;
+  boolean window_unmapped = TRUE;
 
   XAutoRepeatOn(display);
 
@@ -130,22 +140,27 @@ void SleepWhileUnmapped()
 
     switch(event.type)
     {
-      case Expose:
-        HandleExposeEvent((XExposeEvent *) &event);
-       break;
       case ButtonRelease:
        button_status = MB_RELEASED;
        break;
+
       case KeyRelease:
        key_joystick_mapping = 0;
        break;
+
       case MapNotify:
        window_unmapped = FALSE;
        break;
-      case ClientMessage:
-       HandleClientMessageEvent((XClientMessageEvent *) &event);
+
+      case UnmapNotify:
+       /* this is only to surely prevent the 'should not happen' case
+        * of recursively looping between 'SleepWhileUnmapped()' and
+        * 'HandleOtherEvents()' which usually calls this funtion.
+        */
        break;
+
       default:
+       HandleOtherEvents(&event);
        break;
     }
   }
@@ -159,7 +174,7 @@ void HandleExposeEvent(XExposeEvent *event)
   int x = event->x, y = event->y;
   int width = event->width, height = event->height;
 
-  if (direct_draw_on && game_status==PLAYING)
+  if (setup.direct_draw && game_status==PLAYING)
   {
     int xx,yy;
     int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
@@ -167,21 +182,21 @@ void HandleExposeEvent(XExposeEvent *event)
 
     SetDrawtoField(DRAW_BACKBUFFER);
 
-    for(xx=0;xx<SCR_FIELDX;xx++)
-      for(yy=0;yy<SCR_FIELDY;yy++)
+    for(xx=0; xx<SCR_FIELDX; xx++)
+      for(yy=0; yy<SCR_FIELDY; yy++)
        if (xx>=x1 && xx<=x2 && yy>=y1 && yy<=y2)
          DrawScreenField(xx,yy);
-    DrawPlayerField();
+    DrawAllPlayers();
 
     SetDrawtoField(DRAW_DIRECT);
   }
 
-  if (soft_scrolling_on && game_status == PLAYING)
+  if (setup.soft_scrolling && game_status == PLAYING)
   {
     int fx = FX, fy = FY;
 
-    fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
-    fy += (PlayerMovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
+    fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
+    fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
 
     XCopyArea(display,fieldbuffer,backbuffer,gc,
              fx,fy, SXSIZE,SYSIZE,
@@ -243,9 +258,11 @@ void HandleFocusEvent(XFocusChangeEvent *event)
 
 void HandleClientMessageEvent(XClientMessageEvent *event)
 {
+#ifndef MSDOS
   if ((event->window == window) &&
       (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
-    CloseAll();
+    CloseAllAndExit(0);
+#endif
 }
 
 void HandleButton(int mx, int my, int button)
@@ -262,37 +279,70 @@ void HandleButton(int mx, int my, int button)
     old_mx = mx;
     old_my = my;
 
-    HandleVideoButtons(mx,my,button);
-    HandleSoundButtons(mx,my,button);
-    HandleGameButtons(mx,my,button);
+    HandleVideoButtons(mx,my, button);
+    HandleSoundButtons(mx,my, button);
+    HandleGameButtons(mx,my, button);
   }
 
   switch(game_status)
   {
     case MAINMENU:
-      HandleMainMenu(mx,my,0,0,button);
+      HandleMainMenu(mx,my, 0,0, button);
       break;
+
     case TYPENAME:
-      HandleTypeName(0,XK_Return);
+      HandleTypeName(0, XK_Return);
       break;
+
     case CHOOSELEVEL:
-      HandleChooseLevel(mx,my,0,0,button);
+      HandleChooseLevel(mx,my, 0,0, button);
       break;
+
     case HALLOFFAME:
       HandleHallOfFame(button);
       break;
+
     case LEVELED:
-      LevelEd(mx,my,button);
+      LevelEd(mx,my, button);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(button);
       break;
+
     case SETUP:
-      HandleSetupScreen(mx,my,0,0,button);
+      HandleSetupScreen(mx,my, 0,0, button);
       break;
+
+    case SETUPINPUT:
+      HandleSetupInputScreen(mx,my, 0,0, button);
+      break;
+
     case PLAYING:
-      HandleGameActions();
+#ifdef DEBUG
+      if (button == MB_RELEASED)
+      {
+       int sx = (mx - SX) / TILEX;
+       int sy = (my - SY) / TILEY;
+
+       if (IN_VIS_FIELD(sx,sy))
+       {
+         int x = LEVELX(sx);
+         int y = LEVELY(sy);
+
+         printf("INFO: Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
+         printf("      Store[%d][%d] == %d\n", x,y, Store[x][y]);
+         printf("      Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
+         printf("      StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
+         printf("      MovPos[%d][%d] == %d\n", x,y, MovPos[x][y]);
+         printf("      MovDir[%d][%d] == %d\n", x,y, MovDir[x][y]);
+         printf("      MovDelay[%d][%d] == %d\n", x,y, MovDelay[x][y]);
+         printf("\n");
+       }
+      }
+#endif
       break;
+
     default:
       break;
   }
@@ -301,125 +351,53 @@ void HandleButton(int mx, int my, int button)
 void HandleKey(KeySym key, int key_status)
 {
   int joy = 0;
+  static struct SetupKeyboardInfo custom_key;
+  static struct
+  {
+    KeySym *keysym_custom;
+    KeySym keysym_default;
+    byte action;
+  } key_info[] =
+  {
+    { &custom_key.left,  DEFAULT_KEY_LEFT,  JOY_LEFT     },
+    { &custom_key.right, DEFAULT_KEY_RIGHT, JOY_RIGHT    },
+    { &custom_key.up,    DEFAULT_KEY_UP,    JOY_UP       },
+    { &custom_key.down,  DEFAULT_KEY_DOWN,  JOY_DOWN     },
+    { &custom_key.snap,  DEFAULT_KEY_SNAP,  JOY_BUTTON_1 },
+    { &custom_key.bomb,  DEFAULT_KEY_BOMB,  JOY_BUTTON_2 }
+  };
+
+  if (game_status == PLAYING)
+  {
+    int pnr;
+
+    for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+    {
+      int i;
+      byte key_action = 0;
 
-  /* Map cursor keys to joystick directions */
+      if (setup.input[pnr].use_joystick)
+       continue;
 
-  switch(key)
+      custom_key = setup.input[pnr].key;
+
+      for (i=0; i<6; i++)
+       if (key == *key_info[i].keysym_custom)
+         key_action |= key_info[i].action;
+
+      if (key_status == KEY_PRESSED)
+       stored_player[pnr].action |= key_action;
+      else
+       stored_player[pnr].action &= ~key_action;
+    }
+  }
+  else
   {
-    case XK_Left:              /* normale Richtungen */
-#ifdef XK_KP_Left
-    case XK_KP_Left:
-#endif
-    case XK_KP_4:
-#ifndef MSDOS
-    case XK_J:
-#endif
-    case XK_j:
-      joy |= JOY_LEFT;
-      break;
-    case XK_Right:
-#ifdef XK_KP_Right
-    case XK_KP_Right:
-#endif
-    case XK_KP_6:
-#ifndef MSDOS
-    case XK_K:
-#endif
-    case XK_k:
-      joy |= JOY_RIGHT;
-      break;
-    case XK_Up:
-#ifdef XK_KP_Up
-    case XK_KP_Up:
-#endif
-    case XK_KP_8:
-#ifndef MSDOS
-    case XK_I:
-#endif
-    case XK_i:
-      joy |= JOY_UP;
-      break;
-    case XK_Down:
-#ifdef XK_KP_Down
-    case XK_KP_Down:
-#endif
-    case XK_KP_2:
-#ifndef MSDOS
-    case XK_M:
-#endif
-    case XK_m:
-      joy |= JOY_DOWN;
-      break;
-#ifdef XK_KP_Home
-    case XK_KP_Home:           /* Diagonalrichtungen */
-#endif
-    case XK_KP_7:
-      joy |= JOY_UP | JOY_LEFT;
-      break;
-#ifdef XK_KP_Page_Up
-    case XK_KP_Page_Up:
-#endif
-    case XK_KP_9:
-      joy = JOY_UP | JOY_RIGHT;
-      break;
-#ifdef XK_KP_End
-    case XK_KP_End:
-#endif
-    case XK_KP_1:
-      joy |= JOY_DOWN | JOY_LEFT;
-      break;
-#ifdef XK_KP_Page_Down
-    case XK_KP_Page_Down:
-#endif
-    case XK_KP_3:
-      joy |= JOY_DOWN | JOY_RIGHT;
-      break;
-#ifndef MSDOS
-    case XK_S:                 /* Feld entfernen */
-#endif
-    case XK_s:
-      joy |= JOY_BUTTON_1 | JOY_LEFT;
-      break;
-#ifndef MSDOS
-    case XK_D:
-#endif
-    case XK_d:
-      joy |= JOY_BUTTON_1 | JOY_RIGHT;
-      break;
-#ifndef MSDOS
-    case XK_E:
-#endif
-    case XK_e:
-      joy |= JOY_BUTTON_1 | JOY_UP;
-      break;
-#ifndef MSDOS
-    case XK_X:
-#endif
-    case XK_x:
-      joy |= JOY_BUTTON_1 | JOY_DOWN;
-      break;
-    case XK_Shift_L:           /* Linker Feuerknopf */
-#ifndef MSDOS
-    case XK_Control_L:
-    case XK_Alt_L:
-    case XK_Meta_L:
-#endif
-      joy |= JOY_BUTTON_1;
-      break;
-    case XK_Shift_R:           /* Rechter Feuerknopf */
-#ifndef MSDOS
-    case XK_Control_R:
-    case XK_Alt_R:
-    case XK_Meta_R:
-    case XK_Mode_switch:
-    case XK_Multi_key:
-    case XK_B:                 /* (Bombe legen) */
-#endif
-    case XK_b:
-      joy |= JOY_BUTTON_2;
-      break;
-    default:
-      break;
+    int i;
+
+    for (i=0; i<6; i++)
+      if (key == key_info[i].keysym_default)
+       joy |= key_info[i].action;
   }
 
   if (joy)
@@ -438,7 +416,7 @@ void HandleKey(KeySym key, int key_status)
   if (key_status == KEY_RELEASED)
     return;
 
-  if (key==XK_Return && game_status==PLAYING && GameOver)
+  if (key == XK_Return && game_status == PLAYING && AllPlayersGone)
   {
     CloseDoor(DOOR_CLOSE_1);
     game_status = MAINMENU;
@@ -446,7 +424,8 @@ void HandleKey(KeySym key, int key_status)
     return;
   }
 
-  if (key==XK_Escape && game_status!=MAINMENU) /* quick quit to MAINMENU */
+  /* allow quick escape to the main menu with the Escape key */
+  if (key == XK_Escape && game_status != MAINMENU)
   {
     CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
     game_status = MAINMENU;
@@ -454,36 +433,49 @@ void HandleKey(KeySym key, int key_status)
     return;
   }
 
-  if (game_status==PLAYING && (tape.playing || tape.pausing))
+
+
+#ifndef DEBUG
+
+  if (game_status == PLAYING && (tape.playing || tape.pausing))
     return;
 
+#endif
+
+
+
   switch(game_status)
   {
     case TYPENAME:
-      HandleTypeName(0,key);
+      HandleTypeName(0, key);
       break;
+
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
-    {
+    case SETUPINPUT:
       switch(key)
       {
        case XK_Return:
-         if (game_status==MAINMENU)
-           HandleMainMenu(0,0,0,0,MB_MENU_CHOICE);
-          else if (game_status==CHOOSELEVEL)
-            HandleChooseLevel(0,0,0,0,MB_MENU_CHOICE);
-         else if (game_status==SETUP)
-           HandleSetupScreen(0,0,0,0,MB_MENU_CHOICE);
+         if (game_status == MAINMENU)
+           HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
+          else if (game_status == CHOOSELEVEL)
+            HandleChooseLevel(0,0, 0,0, MB_MENU_CHOICE);
+         else if (game_status == SETUP)
+           HandleSetupScreen(0,0, 0,0, MB_MENU_CHOICE);
+         else if (game_status == SETUPINPUT)
+           HandleSetupInputScreen(0,0, 0,0, MB_MENU_CHOICE);
          break;
+
        default:
          break;
       }
       break;
-    }
+
     case HELPSCREEN:
       HandleHelpScreen(MB_RELEASED);
       break;
+
     case HALLOFFAME:
       switch(key)
       {
@@ -492,13 +484,16 @@ void HandleKey(KeySym key, int key_status)
          DrawMainMenu();
          BackToFront();
          break;
+
        default:
          break;
       }
       break;
+
     case LEVELED:
       LevelNameTyping(key);
       break;
+
     case PLAYING:
     {
       switch(key)
@@ -516,12 +511,20 @@ void HandleKey(KeySym key, int key_status)
        case XK_8:
        case XK_9:
          if (key == XK_0)
-           GameSpeed = 500;
+         {
+           if (GameFrameDelay == 500)
+             GameFrameDelay = GAME_FRAME_DELAY;
+           else
+             GameFrameDelay = 500;
+         }
          else
-           GameSpeed = (key - XK_0) * 10;
-         printf("GameSpeed == %d\n", GameSpeed);
+           GameFrameDelay = (key - XK_0) * 10;
+         printf("Game speed == %d%% (%d ms delay between two frames)\n",
+                GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
          break;
 
+
+#if 0
        case XK_a:
          if (ScrollStepSize == TILEX/8)
            ScrollStepSize = TILEX/4;
@@ -529,19 +532,23 @@ void HandleKey(KeySym key, int key_status)
            ScrollStepSize = TILEX/8;
          printf("ScrollStepSize == %d\n", ScrollStepSize);
          break;
+#endif
 
        case XK_f:
          ScrollStepSize = TILEX/8;
          printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
          break;
+
        case XK_g:
          ScrollStepSize = TILEX/4;
          printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize);
          break;
+
        case XK_h:
          ScrollStepSize = TILEX/2;
          printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize);
          break;
+
        case XK_l:
          ScrollStepSize = TILEX;
          printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
@@ -551,78 +558,30 @@ void HandleKey(KeySym key, int key_status)
        case XK_Q:
 #endif
        case XK_q:
-         Dynamite = 1000;
+         local_player->dynamite = 1000;
          break;
 
-       case XK_x:
 
-         {
-           int i,j,k, num_steps = 8, step_size = TILEX / num_steps;
-           static long scroll_delay=0;
-           long scroll_delay_value = 4*4 / num_steps;
 
-           printf("Scroll test\n");
+#if 0
+
+       case XK_z:
+         {
+           int i;
 
-           for(i=0;i<3;i++)
+           for(i=0; i<MAX_PLAYERS; i++)
            {
-             for(j=0;j<SCR_FIELDX;j++)
-             {
-               for(k=0;k<num_steps;k++)
-               {
-                 int xxx = j*TILEX+k*step_size;
-                 int done = 0;
-
-                 while(!done)
-                 {
-                   if (DelayReached(&scroll_delay, scroll_delay_value))
-                   {
-                     XCopyArea(display,fieldbuffer,window,gc,
-                               SX+xxx,SY,
-                               SXSIZE-xxx,SYSIZE,
-                               SX,SY);
-                     XCopyArea(display,fieldbuffer,window,gc,
-                               SX,SY,
-                               xxx,SYSIZE,
-                               SX+SXSIZE-xxx,SY);
-  
-                     XFlush(display);
-                     XSync(display,FALSE);
-
-                     done = 1;
-                   }
-                   else
-                   {
-                     Delay(1);
-                   }
-                 }
-  
-                 /*
-                 Delay(160 / num_steps);
-                 */
-                 /*
-                 Delay(120 / num_steps);
-                 */
-               }
-             }
+             printf("Player %d:\n", i);
+             printf("  jx == %d, jy == %d\n",
+                    stored_player[i].jx, stored_player[i].jy);
+             printf("  last_jx == %d, last_jy == %d\n",
+                    stored_player[i].last_jx, stored_player[i].last_jy);
            }
+           printf("\n");
          }
 
          break;
-
-       case XK_y:
-         {
-           printf("FX = %d, FY = %d\n", FX,FY);
-
-           XCopyArea(display,fieldbuffer,window,gc,
-                     0,0,
-                     MIN(WIN_XSIZE,FXSIZE),MIN(WIN_YSIZE,FYSIZE),
-                     0,0);
-           XFlush(display);
-           XSync(display,FALSE);
-           Delay(1000);
-         }
-
-         break;
+#endif
 #endif
 
        default:
@@ -639,56 +598,73 @@ void HandleNoXEvent()
 {
   if (button_status && game_status != PLAYING)
   {
-    HandleButton(-1,-1,button_status);
+    HandleButton(-1,-1, button_status);
     return;
   }
 
-  switch(game_status)
+#ifndef MSDOS
+  if (options.network)
+    HandleNetworking();
+#endif
+
+  HandleJoystick();
+
+  if (game_status == PLAYING)
+    HandleGameActions();
+}
+
+static int HandleJoystickForAllPlayers()
+{
+  int i;
+  int result = 0;
+
+  for (i=0; i<MAX_PLAYERS; i++)
   {
-    case MAINMENU:
-    case CHOOSELEVEL:
-    case HALLOFFAME:
-    case HELPSCREEN:
-    case SETUP:
-      HandleJoystick();
-      break;
-    case PLAYING:
-      HandleJoystick();
-      HandleGameActions();
-      break;
-    default:
-      break;
+    byte joy_action = 0;
+
+    /*
+    if (!setup.input[i].use_joystick)
+      continue;
+      */
+
+    joy_action = Joystick(i);
+    result |= joy_action;
+
+
+    if (!setup.input[i].use_joystick)
+      continue;
+
+
+    stored_player[i].action = joy_action;
   }
+
+  return result;
 }
 
 void HandleJoystick()
 {
-  int joystick = Joystick();
+  int joystick = HandleJoystickForAllPlayers();
   int keyboard = key_joystick_mapping;
-  int joy      = (tape.playing ? TapePlayAction() : (joystick | keyboard));
+  int joy      = (joystick | keyboard);
   int left     = joy & JOY_LEFT;
   int right    = joy & JOY_RIGHT;
   int up       = joy & JOY_UP;
   int down     = joy & JOY_DOWN;
   int button   = joy & JOY_BUTTON;
-  int button1  = joy & JOY_BUTTON_1;
-  int button2  = joy & JOY_BUTTON_2;
-  int newbutton        = (JoystickButton() == JOY_BUTTON_NEW_PRESSED);
+  int newbutton        = (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED);
   int dx       = (left ? -1    : right ? 1     : 0);
   int dy       = (up   ? -1    : down  ? 1     : 0);
 
-  if (game_status==PLAYING && (tape.playing || keyboard))
-    newbutton = ((joy & JOY_BUTTON) != 0);
-
   switch(game_status)
   {
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
+    case SETUPINPUT:
     {
-      static long joystickmove_delay = 0;
+      static unsigned long joystickmove_delay = 0;
 
-      if (joystick && !button && !DelayReached(&joystickmove_delay,15))
+      if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
        newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)
@@ -697,20 +673,25 @@ void HandleJoystick()
         HandleChooseLevel(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       else if (game_status==SETUP)
        HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
+      else if (game_status==SETUPINPUT)
+       HandleSetupInputScreen(0,0,dx,dy,
+                              newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       break;
     }
+
     case HALLOFFAME:
       HandleHallOfFame(!newbutton);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(!newbutton);
       break;
+
     case PLAYING:
-    {
-      static int player_frame_reset_delay = 0;
-      BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
+      if (tape.playing || keyboard)
+       newbutton = ((joy & JOY_BUTTON) != 0);
 
-      if (GameOver && newbutton)
+      if (AllPlayersGone && newbutton)
       {
        CloseDoor(DOOR_CLOSE_1);
        game_status = MAINMENU;
@@ -718,64 +699,8 @@ void HandleJoystick()
        return;
       }
 
-      if (tape.pausing || PlayerGone)
-       joy = 0;
-
-      if (joy)
-      {
-       player_frame_reset_delay = 0;
-
-       if (button1)
-         snapped = SnapField(dx,dy);
-       else
-       {
-         if (button2)
-           bombed = PlaceBomb();
-         moved = MoveFigure(dx,dy);
-       }
-
-       if (tape.recording && (moved || snapped || bombed))
-       {
-         if (bombed && !moved)
-           joy &= JOY_BUTTON;
-         TapeRecordAction(joy);
-       }
-       else if (tape.playing && snapped)
-         SnapField(0,0);                       /* stop snapping */
-      }
-      else
-      {
-       DigField(0,0,0,0,DF_NO_PUSH);
-       SnapField(0,0);
-       if (++player_frame_reset_delay > MoveSpeed)
-         PlayerFrame = 0;
-      }
-
-      if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)
-      {
-       int next_joy =
-         tape.pos[tape.counter].joystickdata & (JOY_LEFT|JOY_RIGHT);
-
-       if (next_joy == JOY_LEFT || next_joy == JOY_RIGHT)
-       {
-         int dx = (next_joy == JOY_LEFT ? -1 : +1);
-
-         if (IN_LEV_FIELD(JX+dx,JY) && IS_PUSHABLE(Feld[JX+dx][JY]))
-         {
-           int el = Feld[JX+dx][JY];
-           int push_delay = (IS_SB_ELEMENT(el) || el==EL_SONDE ? 2 : 10);
-
-           if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
-           {
-             PlayerMovDir = next_joy;
-             PlayerFrame = FrameCounter % 4;
-             PlayerPushing = TRUE;
-           }
-         }
-       }
-      }
       break;
-    }
+
     default:
       break;
   }