X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=f360abd68334142d390b151a8aac28f8eac1fff2;hp=b563a8605e0c54fd28fea397576e9a119613eadf;hb=0a52f54d2f6ab7dce8062c7738ede185ba5acad3;hpb=19e3dfa321d39a822bda8fa489fb76f25f9f9165

diff --git a/src/events.c b/src/events.c
index b563a860..f360abd6 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,18 +1,18 @@
 /***********************************************************
 *  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 "events.h"
+#include "init.h"
 #include "screens.h"
 #include "tools.h"
 #include "game.h"
@@ -20,12 +20,13 @@
 #include "misc.h"
 #include "tape.h"
 #include "joystick.h"
+#include "network.h"
 
 void EventLoop(void)
 {
   while(1)
   {
-    if (XPending(display))	/* got an event */
+    if (XPending(display))	/* got event from X server */
     {
       XEvent event;
 
@@ -33,44 +34,88 @@ 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;
+
 	default:
+	  HandleOtherEvents(&event);
 	  break;
       }
     }
+
+    HandleNoXEvent();
+
+    /* 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 0
     else			/* got no event, but don't be lazy... */
     {
       HandleNoXEvent();
-      Delay(1000);		/* don't use all CPU time when idle */
+
+      /* 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);
+      }
     }
+#endif
+
 
-    XSync(display,FALSE);
 
-    if (game_status==EXITGAME)
+    if (game_status == EXITGAME)
       return;
   }
 }
 
+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))
@@ -81,23 +126,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;
+
       default:
+	HandleOtherEvents(&event);
 	break;
     }
   }
@@ -105,7 +143,7 @@ void ClearEventQueue()
 
 void SleepWhileUnmapped()
 {
-  BOOL window_unmapped = TRUE;
+  boolean window_unmapped = TRUE;
 
   XAutoRepeatOn(display);
 
@@ -117,19 +155,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 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;
     }
   }
@@ -143,7 +189,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_on && game_status==PLAYING)
   {
     int xx,yy;
     int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
@@ -151,19 +197,26 @@ 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_on && game_status == PLAYING)
+  {
+    int fx = FX, fy = FY;
+
+    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,
+	      fx,fy, SXSIZE,SYSIZE,
 	      SX,SY);
+  }
 
   XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
 
@@ -218,6 +271,13 @@ void HandleFocusEvent(XFocusChangeEvent *event)
   }
 }
 
+void HandleClientMessageEvent(XClientMessageEvent *event)
+{
+  if ((event->window == window) &&
+      (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
+    CloseAllAndExit(0);
+}
+
 void HandleButton(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
@@ -237,43 +297,143 @@ void HandleButton(int mx, int my, int button)
     HandleGameButtons(mx,my,button);
   }
 
+#ifdef DEBUG
+  if (game_status == PLAYING && !button)
+  {
+    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
+
   switch(game_status)
   {
     case MAINMENU:
       HandleMainMenu(mx,my,0,0,button);
       break;
+
     case TYPENAME:
       HandleTypeName(0,XK_Return);
       break;
+
     case CHOOSELEVEL:
       HandleChooseLevel(mx,my,0,0,button);
       break;
+
     case HALLOFFAME:
       HandleHallOfFame(button);
       break;
+
     case LEVELED:
       LevelEd(mx,my,button);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(button);
       break;
+
     case SETUP:
       HandleSetupScreen(mx,my,0,0,button);
       break;
+
+    case SETUPINPUT:
+      HandleSetupInputScreen(mx,my,0,0,button);
+      break;
+
     case PLAYING:
-      HandleGameActions();
+
+      /* --> NoXEvent() will follow */
+
+      /*
+      HandleGameActions(0);
+      */
+
       break;
+
     default:
       break;
   }
 }
 
-int GameSpeed = 2;
-int MoveSpeed = 8;
-
 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;
+
+      if (setup.input[pnr].use_joystick)
+	continue;
+
+      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)
+      {
+	if (network_playing)
+	  local_player->potential_action |= key_action;
+	else
+	  stored_player[pnr].action |= key_action;
+      }
+      else
+      {
+	if (network_playing)
+	  local_player->potential_action &= ~key_action;
+	else
+	  stored_player[pnr].action &= ~key_action;
+      }
+    }
+  }
+  else
+  {
+    int i;
+
+    for (i=0; i<6; i++)
+      if (key == key_info[i].keysym_default)
+	joy |= key_info[i].action;
+  }
+
+
+#if 0
+
 
   /* Map cursor keys to joystick directions */
 
@@ -284,97 +444,135 @@ void HandleKey(KeySym key, int key_status)
     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;
   }
 
+
+#endif
+
+
   if (joy)
   {
     if (key_status == KEY_PRESSED)
@@ -391,7 +589,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;
@@ -415,10 +613,11 @@ void HandleKey(KeySym key, int key_status)
     case TYPENAME:
       HandleTypeName(0,key);
       break;
+
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
-    {
+    case SETUPINPUT:
       switch(key)
       {
 	case XK_Return:
@@ -428,15 +627,19 @@ void HandleKey(KeySym key, int key_status)
             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)
       {
@@ -445,13 +648,16 @@ void HandleKey(KeySym key, int key_status)
 	  DrawMainMenu();
 	  BackToFront();
 	  break;
+
 	default:
 	  break;
       }
       break;
+
     case LEVELED:
       LevelNameTyping(key);
       break;
+
     case PLAYING:
     {
       switch(key)
@@ -468,48 +674,56 @@ void HandleKey(KeySym key, int key_status)
 	case XK_7:
 	case XK_8:
 	case XK_9:
-	  /*
-	  MoveSpeed = key - XK_0;
-	  printf("speed == %d\n", MoveSpeed);
-	  break;
-	  */
-
 	  if (key == XK_0)
-	    GameSpeed = 50;
+	    GameFrameDelay = 500;
 	  else
-	    GameSpeed = key - XK_0;
-	  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 (ScrollSteps == TILEX/4)
-	    ScrollSteps = TILEX/8;
+	  if (ScrollStepSize == TILEX/8)
+	    ScrollStepSize = TILEX/4;
 	  else
-	    ScrollSteps = TILEX/4;
+	    ScrollStepSize = TILEX/8;
+	  printf("ScrollStepSize == %d\n", ScrollStepSize);
 	  break;
+#endif
 
 	case XK_f:
-	  GameSpeed = 2;
-	  printf("GameSpeed == %d\n", GameSpeed);
+	  ScrollStepSize = TILEX/8;
+	  printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
 	  break;
+
 	case XK_g:
-	  GameSpeed = 3;
-	  printf("GameSpeed == %d\n", GameSpeed);
+	  ScrollStepSize = TILEX/4;
+	  printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize);
 	  break;
+
 	case XK_h:
-	  GameSpeed = 4;
-	  printf("GameSpeed == %d\n", GameSpeed);
+	  ScrollStepSize = TILEX/2;
+	  printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize);
 	  break;
+
 	case XK_l:
-	  GameSpeed = 50;
-	  printf("GameSpeed == %d\n", GameSpeed);
+	  ScrollStepSize = TILEX;
+	  printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
 	  break;
 
+#ifndef MSDOS
 	case XK_Q:
+#endif
 	case XK_q:
-	  Dynamite = 1000;
+	  local_player->dynamite = 1000;
 	  break;
 
+
+
+#if 0
+
 	case XK_x:
 
 	  {
@@ -548,15 +762,15 @@ void HandleKey(KeySym key, int key_status)
   		    }
 		    else
 		    {
-		      Delay(1000);
+		      Delay(1);
 		    }
 		  }
   
 		  /*
-		  Delay(160000 / num_steps);
+		  Delay(160 / num_steps);
 		  */
 		  /*
-		  Delay(120000 / num_steps);
+		  Delay(120 / num_steps);
 		  */
 		}
 	      }
@@ -566,6 +780,7 @@ void HandleKey(KeySym key, int key_status)
 	  break;
 
 	case XK_y:
+	  /*
 	  {
 	    printf("FX = %d, FY = %d\n", FX,FY);
 
@@ -575,10 +790,45 @@ void HandleKey(KeySym key, int key_status)
 		      0,0);
 	    XFlush(display);
 	    XSync(display,FALSE);
-	    Delay(1000000);
+	    Delay(1000);
 	  }
+	  */
+
+	  printf("direct_draw_on == %d\n", setup.direct_draw_on);
 
 	  break;
+
+	case XK_z:
+	  {
+	    int i;
+
+	    for(i=0; i<MAX_PLAYERS; i++)
+	    {
+	      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_t:
+	  {
+	    char *color[] = { "yellow", "red", "green", "blue" };
+
+	    do
+	      TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+	    while(!stored_player[TestPlayer].active);
+
+	    printf("TestPlayer = %d (%s player)\n",
+		   TestPlayer, color[TestPlayer]);
+	  }
+
+	  break;
+#endif
 #endif
 
 	default:
@@ -599,6 +849,9 @@ void HandleNoXEvent()
     return;
   }
 
+  if (options.network)
+    HandleNetworking();
+
   switch(game_status)
   {
     case MAINMENU:
@@ -606,12 +859,19 @@ void HandleNoXEvent()
     case HALLOFFAME:
     case HELPSCREEN:
     case SETUP:
+    case SETUPINPUT:
       HandleJoystick();
       break;
+
     case PLAYING:
       HandleJoystick();
-      HandleGameActions();
+
+      /*
+      HandleGameActions(0);
+      */
+
       break;
+
     default:
       break;
   }
@@ -621,30 +881,26 @@ void HandleJoystick()
 {
   int joystick	= Joystick();
   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 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;
 
-      if (joystick && !button && !DelayReached(&joystickmove_delay,15))
+      if (joystick && !button && !DelayReached(&joystickmove_delay,150))
 	newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)
@@ -653,19 +909,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:
-    {
-      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;
@@ -673,61 +935,9 @@ void HandleJoystick()
 	return;
       }
 
-      if (tape.pausing || PlayerGone)
-	joy = 0;
-
-      if (joy)
-      {
-	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);
-	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;
-	    }
-	  }
-	}
-      }
+      HandleGameActions();
       break;
-    }
+
     default:
       break;
   }