X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=60fa3fe9b6c20bb79283fe22d558d6b96095f472;hb=23c658debac513b4ab7e2d1c0f5a8cc011f6927b;hp=0c8bde1b9e04ef02429fdcd9027d9813b2338375;hpb=57bbc28786e5cc6c531b53ef5e29512b1e0b73e8;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 0c8bde1b..60fa3fe9 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -184,15 +184,15 @@ void BackToFront()
     redraw_mask &= ~REDRAW_DOORS;
   }
 
-  if (redraw_mask & REDRAW_MICROLEV)
+  if (redraw_mask & REDRAW_MICROLEVEL)
   {
     XCopyArea(display,backbuffer,window,gc,
-	      MICROLEV_XPOS,MICROLEV_YPOS, MICROLEV_XSIZE,MICROLEV_YSIZE,
-	      MICROLEV_XPOS,MICROLEV_YPOS);
+	      MICROLEV_XPOS, MICROLEV_YPOS, MICROLEV_XSIZE, MICROLEV_YSIZE,
+	      MICROLEV_XPOS, MICROLEV_YPOS);
     XCopyArea(display,backbuffer,window,gc,
-	      SX,MICROLABEL_YPOS, SXSIZE,FONT4_YSIZE,
-	      SX,MICROLABEL_YPOS);
-    redraw_mask &= ~REDRAW_MICROLEV;
+	      SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE,
+	      SX, MICROLABEL_YPOS);
+    redraw_mask &= ~REDRAW_MICROLEVEL;
   }
 
   if (redraw_mask & REDRAW_TILES)
@@ -349,6 +349,7 @@ void DrawTextExt(Drawable d, GC gc, int x, int y,
 {
   int font_width, font_height, font_start;
   int font_pixmap;
+  boolean print_inverse = FALSE;
 
   if (font_size != FS_SMALL && font_size != FS_BIG)
     font_size = FS_SMALL;
@@ -364,10 +365,16 @@ void DrawTextExt(Drawable d, GC gc, int x, int y,
   font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE : FONT2_YSIZE) *
 		FONT_LINES_PER_FONT);
 
-  while(*text)
+  while (*text)
   {
     char c = *text++;
 
+    if (c == '~' && font_size == FS_SMALL && font_type <= FC_YELLOW)
+    {
+      print_inverse = TRUE;
+      continue;
+    }
+
     if (c >= 'a' && c <= 'z')
       c = 'A' + (c - 'a');
     else if (c == 'ä' || c == 'Ä')
@@ -378,10 +385,27 @@ void DrawTextExt(Drawable d, GC gc, int x, int y,
       c = 93;
 
     if (c >= 32 && c <= 95)
-      XCopyArea(display, pix[font_pixmap], d, gc,
-		((c - 32) % FONT_CHARS_PER_LINE) * font_width,
-		((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start,
-		font_width, font_height, x, y);
+    {
+      int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
+      int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start;
+      int dest_x = x, dest_y = y;
+
+      if (print_inverse)
+      {
+	XCopyArea(display, pix[font_pixmap], d, gc,
+		  FONT_CHARS_PER_LINE * font_width,
+		  3 * font_height + font_start,
+		  font_width, font_height, x, y);
+
+	XSetClipOrigin(display, clip_gc[font_pixmap],
+		       dest_x - src_x, dest_y - src_y);
+	XCopyArea(display, pix[font_pixmap], drawto, clip_gc[font_pixmap],
+		  0, 0, font_width, font_height, dest_x, dest_y);
+      }
+      else
+	XCopyArea(display, pix[font_pixmap], d, gc,
+		  src_x, src_y, font_width, font_height, dest_x, dest_y);
+    }
 
     x += font_width;
   }
@@ -1319,10 +1343,20 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
 
   if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
     DrawMiniElement(sx, sy, EL_LEERRAUM);
-  else if (x == -1 || x == lev_fieldx || y == -1 || y == lev_fieldy)
-    DrawMiniElement(sx, sy, EL_BETON);
-  else
+  else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
     DrawMiniElement(sx, sy, Feld[x][y]);
+  else if (x == -1 && y == -1)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_UPPER_LEFT);
+  else if (x == lev_fieldx && y == -1)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_UPPER_RIGHT);
+  else if (x == -1 && y == lev_fieldy)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_LOWER_LEFT);
+  else if (x == lev_fieldx && y == lev_fieldy)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_LOWER_RIGHT);
+  else if (x == -1 || x == lev_fieldx)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_VERTICAL);
+  else if (y == -1 || y == lev_fieldy)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_HORIZONTAL);
 }
 
 void DrawMicroElement(int xpos, int ypos, int element)
@@ -1370,52 +1404,153 @@ void DrawMiniLevel(int scroll_x, int scroll_y)
 {
   int x,y;
 
-  ClearWindow();
-
-  for(x=0; x<2*SCR_FIELDX; x++)
-    for(y=0; y<2*SCR_FIELDY; y++)
+  for(x=0; x<ED_FIELDX; x++)
+    for(y=0; y<ED_FIELDY; y++)
       DrawMiniElementOrWall(x, y, scroll_x, scroll_y);
 
   redraw_mask |= REDRAW_FIELD;
 }
 
-void DrawMicroLevel(int xpos, int ypos)
+static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y)
 {
-  int x,y;
+  int x, y;
 
   /* determine border element for this level */
   SetBorderElement();
 
   XFillRectangle(display, drawto, gc,
-		 xpos - MICRO_TILEX, ypos - MICRO_TILEY,
-		 MICRO_TILEX * (STD_LEV_FIELDX + 2),
-		 MICRO_TILEY * (STD_LEV_FIELDY + 2));
+		 xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE);
+
   if (lev_fieldx < STD_LEV_FIELDX)
-    xpos += (STD_LEV_FIELDX - lev_fieldx)/2 * MICRO_TILEX;
+    xpos += (STD_LEV_FIELDX - lev_fieldx) / 2 * MICRO_TILEX;
   if (lev_fieldy < STD_LEV_FIELDY)
-    ypos += (STD_LEV_FIELDY - lev_fieldy)/2 * MICRO_TILEY;
+    ypos += (STD_LEV_FIELDY - lev_fieldy) / 2 * MICRO_TILEY;
+
+  xpos += MICRO_TILEX;
+  ypos += MICRO_TILEY;
 
   for(x=-1; x<=STD_LEV_FIELDX; x++)
+  {
     for(y=-1; y<=STD_LEV_FIELDY; y++)
-      if (x >= 0 && x < lev_fieldx && y >= 0 && y < lev_fieldy)
+    {
+      int lx = from_x + x, ly = from_y + y;
+
+      if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy)
 	DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
-			 Ur[x][y]);
-      else if (x >= -1 && x < lev_fieldx+1 && y >= -1 && y < lev_fieldy+1)
+			 Ur[lx][ly]);
+      else if (lx >= -1 && lx < lev_fieldx+1 && ly >= -1 && ly < lev_fieldy+1)
 	DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
 			 BorderElement);
+    }
+  }
+
+  redraw_mask |= REDRAW_MICROLEVEL;
+}
 
-  XFillRectangle(display, drawto,gc, SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE);
+static void DrawMicroLevelLabelExt(int mode)
+{
+  char label_text[100];
 
-  if (level.name)
+  XFillRectangle(display, drawto,gc,
+		 SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE);
+
+  strcpy(label_text, (mode == 1 ? level.name :
+		      mode == 2 ? "created by" :
+		      mode == 3 ? level.author : ""));
+
+  if (strlen(label_text) > 0)
   {
-    int len = strlen(level.name);
-    int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2;
-    int lypos = MICROLABEL_YPOS;
+    int size, lxpos, lypos;
+
+    label_text[SXSIZE / FONT4_XSIZE] = '\0';
+
+    size = strlen(label_text);
+    lxpos = SX + (SXSIZE - size * FONT4_XSIZE) / 2;
+    lypos = MICROLABEL_YPOS;
 
-    DrawText(lxpos, lypos, level.name, FS_SMALL, FC_SPECIAL2);
+    DrawText(lxpos, lypos, label_text, FS_SMALL, FC_SPECIAL2);
   }
 
-  redraw_mask |= REDRAW_MICROLEV;
+  redraw_mask |= REDRAW_MICROLEVEL;
+}
+
+void DrawMicroLevel(int xpos, int ypos, boolean restart)
+{
+  static unsigned long scroll_delay = 0;
+  static unsigned long label_delay = 0;
+  static int from_x, from_y, scroll_direction;
+  static int label_state, label_counter;
+
+  if (restart)
+  {
+    from_x = from_y = 0;
+    scroll_direction = MV_RIGHT;
+    label_state = 1;
+    label_counter = 0;
+
+    DrawMicroLevelExt(xpos, ypos, from_x, from_y);
+    DrawMicroLevelLabelExt(label_state);
+
+    /* initialize delay counters */
+    DelayReached(&scroll_delay, 0);
+    DelayReached(&label_delay, 0);
+
+    return;
+  }
+
+  /* scroll micro level, if needed */
+  if ((lev_fieldx > STD_LEV_FIELDX || lev_fieldy > STD_LEV_FIELDY) &&
+      DelayReached(&scroll_delay, MICROLEVEL_SCROLL_DELAY))
+  {
+    switch (scroll_direction)
+    {
+      case MV_LEFT:
+	if (from_x > 0)
+	  from_x--;
+	else
+	  scroll_direction = MV_UP;
+	break;
+
+      case MV_RIGHT:
+	if (from_x < lev_fieldx - STD_LEV_FIELDX)
+	  from_x++;
+	else
+	  scroll_direction = MV_DOWN;
+	break;
+
+      case MV_UP:
+	if (from_y > 0)
+	  from_y--;
+	else
+	  scroll_direction = MV_RIGHT;
+	break;
+
+      case MV_DOWN:
+	if (from_y < lev_fieldy - STD_LEV_FIELDY)
+	  from_y++;
+	else
+	  scroll_direction = MV_LEFT;
+	break;
+
+      default:
+	break;
+    }
+
+    DrawMicroLevelExt(xpos, ypos, from_x, from_y);
+  }
+
+  /* redraw micro level label, if needed */
+  if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 &&
+      strcmp(level.author, ANONYMOUS_NAME) != 0 &&
+      strcmp(level.author, leveldir[leveldir_nr].name) != 0 &&
+      DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY))
+  {
+    label_counter = (label_counter + 1) % 23;
+    label_state = (label_counter >= 0 && label_counter <= 7 ? 1 :
+		   label_counter >= 9 && label_counter <= 12 ? 2 :
+		   label_counter >= 14 && label_counter <= 21 ? 3 : 0);
+    DrawMicroLevelLabelExt(label_state);
+  }
 }
 
 int REQ_in_range(int x, int y)
@@ -1965,6 +2100,7 @@ int el2gfx(int element)
     case EL_SPEED_PILL:		return GFX_SPEED_PILL;
     case EL_SP_TERMINAL_ACTIVE:	return GFX_SP_TERMINAL;
     case EL_SP_BUG_ACTIVE:	return GFX_SP_BUG_ACTIVE;
+    case EL_INVISIBLE_STEEL:	return GFX_INVISIBLE_STEEL;
 
     default:
     {