rnd-19980930-3
[rocksndiamonds.git] / src / events.c
index 63856e59f6480535de10aa9de2440577df04db7c..f1cd50dafaa7dca21d6b7c4583d94300c0540e78 100644 (file)
@@ -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"
@@ -25,7 +25,7 @@ void EventLoop(void)
 {
   while(1)
   {
-    if (XPending(display))     /* got an event */
+    if (XPending(display))     /* got event from X server */
     {
       XEvent event;
 
@@ -54,6 +54,9 @@ void EventLoop(void)
        case FocusOut:
          HandleFocusEvent((XFocusChangeEvent *) &event);
          break;
+        case ClientMessage:
+         HandleClientMessageEvent((XClientMessageEvent *) &event);
+         break;
        default:
          break;
       }
@@ -61,12 +64,18 @@ void EventLoop(void)
     else                       /* got no event, but don't be lazy... */
     {
       HandleNoXEvent();
-      Delay(10000);            /* don't use all CPU time when idle */
-    }
 
-    XSync(display,FALSE);
+      /* 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)
+    if (game_status == EXITGAME)
       return;
   }
 }
@@ -97,6 +106,9 @@ void ClearEventQueue()
       case FocusOut:
        HandleFocusEvent((XFocusChangeEvent *) &event);
        break;
+      case ClientMessage:
+       HandleClientMessageEvent((XClientMessageEvent *) &event);
+       break;
       default:
        break;
     }
@@ -129,6 +141,9 @@ void SleepWhileUnmapped()
       case MapNotify:
        window_unmapped = FALSE;
        break;
+      case ClientMessage:
+       HandleClientMessageEvent((XClientMessageEvent *) &event);
+       break;
       default:
        break;
     }
@@ -149,15 +164,27 @@ void HandleExposeEvent(XExposeEvent *event)
     int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
     int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY;
 
-    drawto_field = backbuffer;
+    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();
 
-    drawto_field = window;
+    SetDrawtoField(DRAW_DIRECT);
+  }
+
+  if (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,
+             SX,SY);
   }
 
   XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
@@ -202,6 +229,7 @@ void HandleFocusEvent(XFocusChangeEvent *event)
     XAutoRepeatOn(display);
     old_joystick_status = joystick_status;
     joystick_status = JOYSTICK_OFF;
+    key_joystick_mapping = 0;
   }
   else if (event->type == FocusIn)
   {
@@ -212,6 +240,13 @@ void HandleFocusEvent(XFocusChangeEvent *event)
   }
 }
 
+void HandleClientMessageEvent(XClientMessageEvent *event)
+{
+  if ((event->window == window) &&
+      (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
+    CloseAll();
+}
+
 void HandleButton(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
@@ -231,6 +266,29 @@ 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:
@@ -255,17 +313,13 @@ void HandleButton(int mx, int my, int button)
       HandleSetupScreen(mx,my,0,0,button);
       break;
     case PLAYING:
-      HandleGameActions();
+      HandleGameActions(0);
       break;
     default:
       break;
   }
 }
 
-int Gamespeed = 4;
-int Movemethod = 0;
-int Movespeed[2] = { 10, 3 };
-
 void HandleKey(KeySym key, int key_status)
 {
   int joy = 0;
@@ -279,7 +333,9 @@ 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;
@@ -288,7 +344,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Right:
 #endif
     case XK_KP_6:
+#ifndef MSDOS
     case XK_K:
+#endif
     case XK_k:
       joy |= JOY_RIGHT;
       break;
@@ -297,7 +355,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Up:
 #endif
     case XK_KP_8:
+#ifndef MSDOS
     case XK_I:
+#endif
     case XK_i:
       joy |= JOY_UP;
       break;
@@ -306,7 +366,9 @@ void HandleKey(KeySym key, int key_status)
     case XK_KP_Down:
 #endif
     case XK_KP_2:
+#ifndef MSDOS
     case XK_M:
+#endif
     case XK_m:
       joy |= JOY_DOWN;
       break;
@@ -334,27 +396,47 @@ void HandleKey(KeySym key, int key_status)
     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;
@@ -370,15 +452,15 @@ void HandleKey(KeySym key, int key_status)
       key_joystick_mapping &= ~joy;
 
     HandleJoystick();
-
-    if (game_status != PLAYING)
-      key_joystick_mapping = 0;
   }
 
+  if (game_status != PLAYING)
+    key_joystick_mapping = 0;
+
   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;
@@ -455,71 +537,151 @@ void HandleKey(KeySym key, int key_status)
        case XK_7:
        case XK_8:
        case XK_9:
-         Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
-         printf("method == %d, speed == %d\n",
-                Movemethod, Movespeed[Movemethod]);
+         if (key == XK_0)
+           GameFrameDelay = 500;
+         else
+           GameFrameDelay = (key - XK_0) * 10;
+         printf("Game speed == %d%% (%d ms delay between two frames)\n",
+                GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
          break;
 
        case XK_a:
-         Movemethod = !Movemethod;
-         printf("method == %d, speed == %d\n",
-                Movemethod, Movespeed[Movemethod]);
+         if (ScrollStepSize == TILEX/8)
+           ScrollStepSize = TILEX/4;
+         else
+           ScrollStepSize = TILEX/8;
+         printf("ScrollStepSize == %d\n", ScrollStepSize);
          break;
 
        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 = 10;
-         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;
-#endif
 
        case XK_x:
-         /*
+
          {
-           int i,j,k, num_steps = 4, step_size = TILEX / num_steps;
+           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;
 
-           for(i=0;i<10;i++)
+           printf("Scroll test\n");
+
+           for(i=0;i<3;i++)
            {
              for(j=0;j<SCR_FIELDX;j++)
              {
                for(k=0;k<num_steps;k++)
                {
                  int xxx = j*TILEX+k*step_size;
-
-                 XCopyArea(display,backbuffer,window,gc,
-                           REAL_SX+xxx,REAL_SY,
-                           FULL_SXSIZE-xxx,FULL_SYSIZE,
-                           REAL_SX,REAL_SY);
-                 XCopyArea(display,backbuffer,window,gc,
-                           REAL_SX,REAL_SY,
-                           xxx,FULL_SYSIZE,
-                           REAL_SX+FULL_SXSIZE-xxx,REAL_SY);
-
-                 XFlush(display);
-                 XSync(display,FALSE);
-                 Delay(120000 / num_steps);
+                 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);
+                 */
                }
              }
            }
          }
+
+         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);
+         }
          */
+
+         printf("direct_draw_on == %d\n", 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
 
        default:
          break;
@@ -531,14 +693,209 @@ void HandleKey(KeySym key, int key_status)
   }
 }
 
+
+
+/* TEST STUFF -------------------------------------------------------------- */
+
+#define PROT_VERS_1 1
+#define PROT_VERS_2 0
+#define PROT_VERS_3 1
+
+#define OP_NICK 1
+#define OP_PLAY 2
+#define OP_FALL 3
+#define OP_DRAW 4
+#define OP_LOST 5
+#define OP_GONE 6
+#define OP_CLEAR 7
+#define OP_NEW 8
+#define OP_LINES 9
+#define OP_GROW 10
+#define OP_MODE 11
+#define OP_LEVEL 12
+#define OP_BOT 13
+#define OP_KILL 14
+#define OP_PAUSE 15
+#define OP_CONT 16
+#define OP_VERSION 17
+#define OP_BADVERS 18
+#define OP_MSG 19
+#define OP_YOUARE 20
+#define OP_LINESTO 21
+#define OP_WON 22
+#define OP_ZERO 23
+
+/* server stuff */
+
+#define BUFLEN 4096
+
+extern int sfd;
+extern unsigned char realbuf[], readbuf[], writbuf[];
+extern unsigned char *buf;
+extern int nread, nwrite;
+
+extern void fatal(char *);
+extern void flushbuf(void);
+extern void sysmsg(char *);
+
+/* like memcpy, but guaranteed to handle overlap when s <= t */
+void copydown(char *s, char *t, int n)
+{
+  for (; n; n--)
+    *(s++) = *(t++);
+}
+
+void handlemessages()
+{
+  unsigned int len;
+  static char msgbuf[300];
+
+  while (nread >= 4 && nread >= 4 + readbuf[3])
+  {
+    len = readbuf[3];
+    if (readbuf[0] || readbuf[1] || readbuf[2])
+      fatal("Wrong server line length");
+
+    memcpy(buf, &readbuf[4], len);
+    nread -= 4 + len;
+    copydown(readbuf, readbuf + 4 + len, nread);
+
+    switch(buf[1])
+    {
+      case OP_YOUARE:
+       printf("OP_YOUARE: %d\n", buf[0]);
+       break;
+
+      case OP_NEW:
+       printf("OP_NEW: %d\n", buf[0]);
+       sprintf(msgbuf, "new client %d connected", buf[0]);
+       sysmsg(msgbuf);
+       break;
+      
+      case OP_GONE:
+       printf("OP_GONE: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d disconnected", buf[0]);
+       sysmsg(msgbuf);
+       break;
+
+      case OP_BADVERS:
+       {
+         static char tmpbuf[128];
+
+         sprintf(tmpbuf, "Protocol version mismatch: server expects %d.%d.x instead of %d.%d.%d\n", buf[2], buf[3], PROT_VERS_1, PROT_VERS_2, PROT_VERS_3);
+         fatal(tmpbuf);
+       }
+       break;
+      
+      case OP_PLAY:
+       printf("OP_PLAY: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d starts game", buf[0]);
+       sysmsg(msgbuf);
+       break;
+
+      case OP_PAUSE:
+       printf("OP_PAUSE: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d pauses game", buf[0]);
+       sysmsg(msgbuf);
+       break;
+
+      case OP_CONT:
+       printf("OP_CONT: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d continues game", buf[0]);
+       sysmsg(msgbuf);
+       break;
+
+      case OP_WON:
+       printf("OP_WON: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d wins the game", buf[0]);
+       sysmsg(msgbuf);
+       break;
+
+      case OP_ZERO:
+       printf("OP_ZERO: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d resets game counters", buf[0]);
+       sysmsg(msgbuf);
+       break;
+
+      case OP_NICK:
+       printf("OP_NICK: %d\n", buf[0]);
+        sprintf(msgbuf, "client %d calls itself %s", buf[0], &buf[2]);
+        sysmsg(msgbuf);
+       break;
+
+      case OP_MSG:
+       printf("OP_MSG: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d sends message", buf[0]);
+       break;
+      
+      case OP_LOST:
+       printf("OP_MSG: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d has lost", buf[0]);
+       break;
+      
+      case OP_LEVEL:
+       printf("OP_MSG: %d\n", buf[0]);
+       sprintf(msgbuf, "client %d sets level to %d", buf[0], buf[2]);
+       break;
+    }
+  }
+
+  fflush(stdout);
+}
+
+
+
+static void HandleNetworking()
+{
+  static struct timeval tv = { 0, 0 };
+  fd_set rfds;
+  int r = 0;
+
+  if (standalone)
+    return;
+
+  flushbuf();
+
+  FD_ZERO(&rfds);
+  FD_SET(sfd, &rfds);
+
+  r = select(sfd + 1, &rfds, NULL, NULL, &tv);
+
+  if (r < 0 && errno != EINTR)
+  {
+    perror("select");
+    fatal("fatal: select() failed");
+  }
+
+  if (r < 0)
+    FD_ZERO(&rfds);
+
+  if (FD_ISSET(sfd, &rfds))
+  {
+    int r;
+
+    r = read(sfd, readbuf + nread, BUFLEN - nread);
+
+    if (r < 0)
+      fatal("Error reading from server");
+    if (r == 0)
+      fatal("Connection to server lost");
+    nread += r;
+
+    handlemessages();
+  }
+}
+
 void HandleNoXEvent()
 {
-  if (button_status && game_status!=PLAYING)
+  if (button_status && game_status != PLAYING)
   {
     HandleButton(-1,-1,button_status);
     return;
   }
 
+  HandleNetworking();
+
   switch(game_status)
   {
     case MAINMENU:
@@ -550,7 +907,11 @@ void HandleNoXEvent()
       break;
     case PLAYING:
       HandleJoystick();
-      HandleGameActions();
+
+      /*
+      HandleGameActions(0);
+      */
+
       break;
     default:
       break;
@@ -561,21 +922,21 @@ 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:
@@ -595,17 +956,20 @@ void HandleJoystick()
        HandleSetupScreen(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;
@@ -613,64 +977,12 @@ void HandleJoystick()
        return;
       }
 
-      if (tape.pausing || PlayerGone)
+      if (tape.pausing || AllPlayersGone)
        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;
-           }
-         }
-       }
-      }
-
-      DrawPlayerField();
-
+      HandleGameActions(joy);
       break;
-    }
+
     default:
       break;
   }