rnd-19980930-1
[rocksndiamonds.git] / src / events.c
index 73d681d72efa38f7f274741b390aade98a81c311..d0684ed3d220061fbcb3076b55b6ddd1c97054b2 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                                                *
 ***********************************************************/
@@ -167,11 +166,11 @@ 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);
   }
@@ -180,8 +179,8 @@ void HandleExposeEvent(XExposeEvent *event)
   {
     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,
@@ -267,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:
@@ -291,7 +313,7 @@ void HandleButton(int mx, int my, int button)
       HandleSetupScreen(mx,my,0,0,button);
       break;
     case PLAYING:
-      HandleGameActions();
+      HandleGameActions(0);
       break;
     default:
       break;
@@ -438,7 +460,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;
@@ -516,10 +538,11 @@ void HandleKey(KeySym key, int key_status)
        case XK_8:
        case XK_9:
          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;
 
        case XK_a:
@@ -551,7 +574,7 @@ void HandleKey(KeySym key, int key_status)
        case XK_Q:
 #endif
        case XK_q:
-         Dynamite = 1000;
+         local_player->dynamite = 1000;
          break;
 
        case XK_x:
@@ -610,6 +633,7 @@ void HandleKey(KeySym key, int key_status)
          break;
 
        case XK_y:
+         /*
          {
            printf("FX = %d, FY = %d\n", FX,FY);
 
@@ -621,6 +645,40 @@ void HandleKey(KeySym key, int key_status)
            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
@@ -654,7 +712,11 @@ void HandleNoXEvent()
       break;
     case PLAYING:
       HandleJoystick();
-      HandleGameActions();
+
+      /*
+      HandleGameActions(0);
+      */
+
       break;
     default:
       break;
@@ -665,21 +727,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:
@@ -699,18 +761,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:
-    {
-      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 +782,12 @@ void HandleJoystick()
        return;
       }
 
-      if (tape.pausing || PlayerGone)
+      if (tape.pausing || AllPlayersGone)
        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;
-           }
-         }
-       }
-      }
+      HandleGameActions(joy);
       break;
-    }
+
     default:
       break;
   }