X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=f987d323a2f550c0b778f3eda9e4fd1ec268daa9;hb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;hp=2aad13a9ade064e7ad2d2c73b9719f262b78f059;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 2aad13a9..f987d323 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -356,11 +356,17 @@ void DrawPlayer(struct PlayerInfo *player)
   int element = Feld[jx][jy];
   int graphic, phase;
 
+  /*
   if (!player->active || player->gone || !IN_SCR_FIELD(sx,sy))
     return;
+  */
+
+  if (!player->active || player->gone ||
+      !IN_SCR_FIELD(SCREENX(last_jx),SCREENY(last_jy)))
+    return;
 
 #if DEBUG
-  if (!IN_LEV_FIELD(jx,jy) || !IN_SCR_FIELD(sx,sy))
+  if (!IN_LEV_FIELD(jx,jy))
   {
     printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy);
     printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy);
@@ -372,9 +378,6 @@ void DrawPlayer(struct PlayerInfo *player)
   if (element == EL_EXPLODING)
     return;
 
-  if (direct_draw_on)
-    SetDrawtoField(DRAW_BUFFERED);
-
   /* draw things in the field the player is leaving, if needed */
 
   if (last_jx != jx || last_jy != jy)
@@ -382,14 +385,14 @@ void DrawPlayer(struct PlayerInfo *player)
     if (Store[last_jx][last_jy])
     {
       DrawLevelElement(last_jx,last_jy, Store[last_jx][last_jy]);
-      DrawLevelElementThruMask(last_jx,last_jy, Feld[last_jx][last_jy]);
+      DrawLevelFieldThruMask(last_jx,last_jy);
     }
     else if (Feld[last_jx][last_jy] == EL_DYNAMIT)
       DrawDynamite(last_jx,last_jy);
     else
       DrawLevelField(last_jx,last_jy);
 
-    if (player->Pushing)
+    if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx),SCREENY(next_jy)))
     {
       if (player->GfxPos)
       {
@@ -403,6 +406,12 @@ void DrawPlayer(struct PlayerInfo *player)
     }
   }
 
+  if (!IN_SCR_FIELD(sx,sy))
+    return;
+
+  if (direct_draw_on)
+    SetDrawtoField(DRAW_BUFFERED);
+
   /* draw things behind the player, if needed */
 
   if (Store[jx][jy])
@@ -421,7 +430,7 @@ void DrawPlayer(struct PlayerInfo *player)
   else	/* MV_DOWN || MV_NO_MOVING */
     graphic = GFX_SPIELER1_DOWN;
 
-  graphic += player->nr * 3*HEROES_PER_LINE;
+  graphic += player->index_nr * 3*HEROES_PER_LINE;
   graphic += player->Frame;
 
   if (player->GfxPos)
@@ -483,6 +492,16 @@ void DrawPlayer(struct PlayerInfo *player)
     DrawGraphicThruMask(sx,sy, graphic + phase);
   }
 
+  if ((last_jx != jx || last_jy != jy) && Feld[last_jx][last_jy]==EL_EXPLODING)
+  {
+    int phase = Frame[last_jx][last_jy];
+    int delay = 2;
+
+    if (phase > 2)
+      DrawGraphicThruMask(SCREENX(last_jx),SCREENY(last_jy),
+			  GFX_EXPLOSION + ((phase-1)/delay-1));
+  }
+
   if (direct_draw_on)
   {
     int dest_x = SX + SCREENX(MIN(jx,last_jx))*TILEX;
@@ -545,7 +564,6 @@ void DrawGraphicAnimationThruMask(int x, int y, int graphic,
 
 void DrawGraphic(int x, int y, int graphic)
 {
-
 #if DEBUG
   if (!IN_SCR_FIELD(x,y))
   {
@@ -592,11 +610,6 @@ void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
 
 void DrawGraphicThruMask(int x, int y, int graphic)
 {
-  int src_x,src_y, dest_x,dest_y;
-  int tile = graphic;
-  Pixmap src_pixmap;
-  GC drawing_gc;
-
 #if DEBUG
   if (!IN_SCR_FIELD(x,y))
   {
@@ -606,6 +619,17 @@ void DrawGraphicThruMask(int x, int y, int graphic)
   }
 #endif
 
+  DrawGraphicThruMaskExt(drawto_field, FX+x*TILEX, FY+y*TILEY, graphic);
+  MarkTileDirty(x,y);
+}
+
+void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic)
+{
+  int src_x, src_y;
+  int tile = graphic;
+  Pixmap src_pixmap;
+  GC drawing_gc;
+
   if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
   {
     src_pixmap = pix[PIX_BACK];
@@ -624,13 +648,10 @@ void DrawGraphicThruMask(int x, int y, int graphic)
   }
   else
   {
-    DrawGraphic(x,y,graphic);
+    DrawGraphicExt(d, gc, dest_x,dest_y, graphic);
     return;
   }
 
-  dest_x = FX + x*TILEX;
-  dest_y = FY + y*TILEY;
-
   if (tile_clipmask[tile] != None)
   {
     XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]);
@@ -648,8 +669,6 @@ void DrawGraphicThruMask(int x, int y, int graphic)
     XCopyArea(display, src_pixmap, drawto_field, drawing_gc,
 	      src_x,src_y, TILEX,TILEY, dest_x,dest_y);
   }
-
-  MarkTileDirty(x,y);
 }
 
 void DrawMiniGraphic(int x, int y, int graphic)
@@ -946,6 +965,11 @@ void DrawLevelElementThruMask(int x, int y, int element)
   DrawLevelElementExt(x,y, 0,0, element, NO_CUTTING, USE_MASKING);
 }
 
+void DrawLevelFieldThruMask(int x, int y)
+{
+  DrawLevelElementExt(x,y, 0,0, Feld[x][y], NO_CUTTING, USE_MASKING);
+}
+
 void ErdreichAnbroeckeln(int x, int y)
 {
   int i, width, height, cx,cy;
@@ -1087,13 +1111,8 @@ void DrawScreenField(int x, int y)
 	Store[ux][uy]==EL_AMOEBE_NASS)
       cut_mode = CUT_ABOVE;
     else if (Store[ux][uy]==EL_MORAST_VOLL ||
-
-#if 0
-	Store[ux][uy]==EL_SALZSAEURE ||
-#endif
-
-	Store[ux][uy]==EL_SIEB_VOLL ||
-	Store[ux][uy]==EL_SIEB2_VOLL)
+	     Store[ux][uy]==EL_SIEB_VOLL ||
+	     Store[ux][uy]==EL_SIEB2_VOLL)
       cut_mode = CUT_BELOW;
 
     if (cut_mode==CUT_ABOVE)
@@ -1106,11 +1125,8 @@ void DrawScreenField(int x, int y)
     else
       DrawScreenElementShifted(x,y, 0,MovPos[ux][uy], element, cut_mode);
 
-#if 1
     if (Store[ux][uy] == EL_SALZSAEURE)
       DrawLevelElementThruMask(ux,uy+1, EL_SALZSAEURE);
-#endif
-
   }
   else if (IS_BLOCKED(ux,uy))
   {
@@ -1274,7 +1290,7 @@ void DrawMicroLevel(int xpos, int ypos)
   redraw_mask |= REDRAW_MICROLEV;
 }
 
-int AYS_in_range(int x, int y)
+int REQ_in_range(int x, int y)
 {
   if (y>DY+249 && y<DY+278)
   {
@@ -1286,7 +1302,7 @@ int AYS_in_range(int x, int y)
   return(0);
 }
 
-BOOL AreYouSure(char *text, unsigned int ays_state)
+BOOL Request(char *text, unsigned int req_state)
 {
   int mx,my, ty, result = -1;
   unsigned int old_door_state;
@@ -1330,21 +1346,53 @@ BOOL AreYouSure(char *text, unsigned int ays_state)
     text+=(tl+(tc==32));
   }
 
-  if (ays_state & AYS_ASK)
+  if (req_state & REQ_ASK)
     XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX4,OK_BUTTON_GFX_YPOS,
 	      DXSIZE,OK_BUTTON_YSIZE,
 	      DOOR_GFX_PAGEX1,OK_BUTTON_YPOS);
-  else if (ays_state & AYS_CONFIRM)
+  else if (req_state & REQ_CONFIRM)
     XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX4,CONFIRM_BUTTON_GFX_YPOS,
 	      DXSIZE,CONFIRM_BUTTON_YSIZE,
 	      DOOR_GFX_PAGEX1,CONFIRM_BUTTON_YPOS);
+  else if (req_state & REQ_PLAYER)
+  {
+    DrawPlayerButton(BUTTON_PLAYER_1, DB_INIT);
+    DrawPlayerButton(BUTTON_PLAYER_2, DB_INIT);
+    DrawPlayerButton(BUTTON_PLAYER_3, DB_INIT);
+    DrawPlayerButton(BUTTON_PLAYER_4, DB_INIT);
+
+    /*
+    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
+	      DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
+	      PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
+	      DOOR_GFX_PAGEX1 + PLAYER_BUTTON_1_XPOS, PLAYER_BUTTON_1_YPOS);
+    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
+	      DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
+	      PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
+	      DOOR_GFX_PAGEX1 + PLAYER_BUTTON_1_XPOS, PLAYER_BUTTON_1_YPOS);
+    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
+	      DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
+	      PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
+	      DOOR_GFX_PAGEX1 + PLAYER_BUTTON_2_XPOS, PLAYER_BUTTON_2_YPOS);
+    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
+	      DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
+	      PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
+	      DOOR_GFX_PAGEX1 + PLAYER_BUTTON_3_XPOS, PLAYER_BUTTON_3_YPOS);
+    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
+	      DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
+	      PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
+	      DOOR_GFX_PAGEX1 + PLAYER_BUTTON_4_XPOS, PLAYER_BUTTON_4_YPOS);
+    */
+  }
 
   OpenDoor(DOOR_OPEN_1);
   ClearEventQueue();
 
-  if (!(ays_state & AYS_ASK) && !(ays_state & AYS_CONFIRM))
+  if (!(req_state & REQ_ASK) &&
+      !(req_state & REQ_CONFIRM) &&
+      !(req_state & REQ_PLAYER))
     return(FALSE);
 
   if (game_status != MAINMENU)
@@ -1393,10 +1441,12 @@ BOOL AreYouSure(char *text, unsigned int ays_state)
 	      button_status = MB_RELEASED;
 	  }
 
-	  if (ays_state & AYS_ASK)
-	    choice = CheckChooseButtons(mx,my,button_status);
-	  else
+	  if (req_state & REQ_ASK)
+	    choice = CheckYesNoButtons(mx,my,button_status);
+	  else if (req_state & REQ_CONFIRM)
 	    choice = CheckConfirmButton(mx,my,button_status);
+	  else
+	    choice = CheckPlayerButtons(mx,my,button_status);
 
 	  switch(choice)
 	  {
@@ -1407,7 +1457,19 @@ BOOL AreYouSure(char *text, unsigned int ays_state)
 	      result = FALSE;
 	      break;
 	    case BUTTON_CONFIRM:
-	      result = TRUE|FALSE;
+	      result = TRUE | FALSE;
+	      break;
+	    case BUTTON_PLAYER_1:
+	      result = 1;
+	      break;
+	    case BUTTON_PLAYER_2:
+	      result = 2;
+	      break;
+	    case BUTTON_PLAYER_3:
+	      result = 3;
+	      break;
+	    case BUTTON_PLAYER_4:
+	      result = 4;
 	      break;
 	    default:
 	      break;
@@ -1425,6 +1487,8 @@ BOOL AreYouSure(char *text, unsigned int ays_state)
 	      result = 0;
 	      break;
 	  }
+	  if (req_state & REQ_PLAYER)
+	    result = 0;
 	  break;
 	case KeyRelease:
 	  key_joystick_mapping = 0;
@@ -1454,11 +1518,11 @@ BOOL AreYouSure(char *text, unsigned int ays_state)
   if (game_status != MAINMENU)
     StopAnimation();
 
-  if (!(ays_state & AYS_STAY_OPEN))
+  if (!(req_state & REQ_STAY_OPEN))
   {
     CloseDoor(DOOR_CLOSE_1);
 
-    if (!(ays_state & AYS_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
+    if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
     {
       XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
 		DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
@@ -1736,6 +1800,9 @@ int el2gfx(int element)
     case EL_ZEIT_VOLL:		return(GFX_ZEIT_VOLL);
     case EL_ZEIT_LEER:		return(GFX_ZEIT_LEER);
     case EL_MAUER_LEBT:		return(GFX_MAUER_LEBT);
+    case EL_MAUER_X:		return(GFX_MAUER_X);
+    case EL_MAUER_Y:		return(GFX_MAUER_Y);
+    case EL_MAUER_XY:		return(GFX_MAUER_XY);
     case EL_EDELSTEIN_BD:	return(GFX_EDELSTEIN_BD);
     case EL_EDELSTEIN_GELB:	return(GFX_EDELSTEIN_GELB);
     case EL_EDELSTEIN_ROT:	return(GFX_EDELSTEIN_ROT);