X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=e46b0a6dd34c564336ed8a5dd9b5fe761dddebe8;hb=cb81cac37a6a681c0ee295918e5ef919fbef1e90;hp=85cee1ddac6fc2a02421c485d1d982ffe87206de;hpb=d6d1c9d93fa318a7e49304f008dd6a965a5dc48c;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 85cee1dd..e46b0a6d 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -533,9 +533,8 @@ void FadeExt(int fade_mask, int fade_mode)
 {
   void (*draw_border_function)(void) = NULL;
   Bitmap *bitmap = (fade_mode == FADE_MODE_CROSSFADE ? bitmap_db_cross : NULL);
-  int fade_delay = menu.fade_delay;
-  int post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0);
   int x, y, width, height;
+  int fade_delay, post_delay;
 
   if (fade_mask & REDRAW_FIELD)
   {
@@ -544,6 +543,9 @@ void FadeExt(int fade_mask, int fade_mode)
     width  = FULL_SXSIZE;
     height = FULL_SYSIZE;
 
+    fade_delay = menu.fade_delay;
+    post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0);
+
     draw_border_function = DrawMaskedBorder_FIELD;
   }
   else		/* REDRAW_ALL */
@@ -552,6 +554,9 @@ void FadeExt(int fade_mask, int fade_mode)
     y = 0;
     width  = WIN_XSIZE;
     height = WIN_YSIZE;
+
+    fade_delay = title.fade_delay_final;
+    post_delay = (fade_mode == FADE_MODE_FADE_OUT ? title.post_delay_final : 0);
   }
 
   redraw_mask |= fade_mask;
@@ -1670,8 +1675,6 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
 static void DrawPreviewLevelExt(int from_x, int from_y)
 {
   boolean show_level_border = (BorderElement != EL_EMPTY);
-  int dst_x = preview.x;
-  int dst_y = preview.y;
   int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
   int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
   int tile_size = preview.tile_size;
@@ -1679,6 +1682,8 @@ static void DrawPreviewLevelExt(int from_x, int from_y)
   int preview_height = preview.ysize * tile_size;
   int real_preview_xsize = MIN(level_xsize, preview.xsize);
   int real_preview_ysize = MIN(level_ysize, preview.ysize);
+  int dst_x = SX + ALIGNED_XPOS(preview.x, preview_width, preview.align);
+  int dst_y = SY + preview.y;
   int x, y;
 
   DrawBackground(dst_x, dst_y, preview_width, preview_height);
@@ -1712,8 +1717,24 @@ static void DrawPreviewLevelExt(int from_x, int from_y)
 #define MICROLABEL_IMPORTED_BY_HEAD	6
 #define MICROLABEL_IMPORTED_BY		7
 
+static int getMaxTextLength(struct MenuPosInfo *pos, int font_nr)
+{
+  int max_text_width = SXSIZE;
+  int font_width = getFontWidth(font_nr);
+
+  if (pos->align == ALIGN_CENTER)
+    max_text_width = (pos->x < SXSIZE / 2 ? pos->x * 2 : (SXSIZE - pos->x) * 2);
+  else if (pos->align == ALIGN_RIGHT)
+    max_text_width = pos->x;
+  else
+    max_text_width = SXSIZE - pos->x;
+
+  return max_text_width / font_width;
+}
+
 static void DrawPreviewLevelLabelExt(int mode)
 {
+  struct MenuPosInfo *pos = &menu.main.text.level_info_2;
   char label_text[MAX_OUTPUT_LINESIZE + 1];
   int max_len_label_text;
   int font_nr = FONT_TEXT_2;
@@ -1724,7 +1745,11 @@ static void DrawPreviewLevelLabelExt(int mode)
       mode == MICROLABEL_IMPORTED_BY_HEAD)
     font_nr = FONT_TEXT_3;
 
+#if 1
+  max_len_label_text = getMaxTextLength(pos, font_nr);
+#else
   max_len_label_text = SXSIZE / getFontWidth(font_nr);
+#endif
 
   for (i = 0; i < max_len_label_text; i++)
     label_text[i] = ' ';
@@ -1733,15 +1758,13 @@ static void DrawPreviewLevelLabelExt(int mode)
   if (strlen(label_text) > 0)
   {
 #if 1
-    int text_width = getTextWidth(label_text, font_nr);
-    int lxpos = SX + menu.main.text.level_info_2.x - text_width / 2;
-    int lypos = SY + menu.main.text.level_info_2.y;
+    DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
 #else
     int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2;
     int lypos = MICROLABEL2_YPOS;
-#endif
 
     DrawText(lxpos, lypos, label_text, font_nr);
+#endif
   }
 
   strncpy(label_text,
@@ -1758,15 +1781,13 @@ static void DrawPreviewLevelLabelExt(int mode)
   if (strlen(label_text) > 0)
   {
 #if 1
-    int text_width = getTextWidth(label_text, font_nr);
-    int lxpos = SX + menu.main.text.level_info_2.x - text_width / 2;
-    int lypos = SY + menu.main.text.level_info_2.y;
+    DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
 #else
     int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2;
     int lypos = MICROLABEL2_YPOS;
-#endif
 
     DrawText(lxpos, lypos, label_text, font_nr);
+#endif
   }
 
   redraw_mask |= REDRAW_MICROLEVEL;
@@ -1789,8 +1810,20 @@ void DrawPreviewLevel(boolean restart)
 
   if (restart)
   {
-    from_x = preview.xoffset;
-    from_y = preview.yoffset;
+    from_x = 0;
+    from_y = 0;
+
+    if (preview.anim_mode == ANIM_CENTERED)
+    {
+      if (level_xsize > preview.xsize)
+	from_x = (level_xsize - preview.xsize) / 2;
+      if (level_ysize > preview.ysize)
+	from_y = (level_ysize - preview.ysize) / 2;
+    }
+
+    from_x += preview.xoffset;
+    from_y += preview.yoffset;
+
     scroll_direction = MV_RIGHT;
     label_state = 1;
     label_counter = 0;
@@ -1804,25 +1837,30 @@ void DrawPreviewLevel(boolean restart)
 
     if (leveldir_current->name)
     {
+      struct MenuPosInfo *pos = &menu.main.text.level_info_1;
       char label_text[MAX_OUTPUT_LINESIZE + 1];
       int font_nr = FONT_TEXT_1;
+#if 1
+      int max_len_label_text = getMaxTextLength(pos, font_nr);
+#else
       int max_len_label_text = SXSIZE / getFontWidth(font_nr);
+#endif
+#if 0
       int text_width;
       int lxpos, lypos;
+#endif
 
       strncpy(label_text, leveldir_current->name, max_len_label_text);
       label_text[max_len_label_text] = '\0';
 
 #if 1
-      text_width = getTextWidth(label_text, font_nr);
-      lxpos = SX + menu.main.text.level_info_1.x - text_width / 2;
-      lypos = SY + menu.main.text.level_info_1.y;
+      DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
 #else
       lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2;
       lypos = SY + MICROLABEL1_YPOS;
-#endif
 
       DrawText(lxpos, lypos, label_text, font_nr);
+#endif
     }
 
     game_status = last_game_status;	/* restore current game status */
@@ -1831,7 +1869,8 @@ void DrawPreviewLevel(boolean restart)
   }
 
   /* scroll preview level, if needed */
-  if ((level_xsize > preview.xsize || level_ysize > preview.ysize) &&
+  if (preview.anim_mode != ANIM_NONE &&
+      (level_xsize > preview.xsize || level_ysize > preview.ysize) &&
       DelayReached(&scroll_delay, scroll_delay_value))
   {
     switch (scroll_direction)
@@ -2568,7 +2607,7 @@ boolean Request(char *text, unsigned int req_state)
 
       NextEvent(&event);
 
-      switch(event.type)
+      switch (event.type)
       {
 	case EVENT_BUTTONPRESS:
 	case EVENT_BUTTONRELEASE:
@@ -2600,7 +2639,7 @@ boolean Request(char *text, unsigned int req_state)
 	  /* this sets 'request_gadget_id' */
 	  HandleGadgets(mx, my, button_status);
 
-	  switch(request_gadget_id)
+	  switch (request_gadget_id)
 	  {
 	    case TOOL_CTRL_ID_YES:
 	      result = TRUE;
@@ -2633,7 +2672,7 @@ boolean Request(char *text, unsigned int req_state)
 	}
 
 	case EVENT_KEYPRESS:
-	  switch(GetEventKey((KeyEvent *)&event, TRUE))
+	  switch (GetEventKey((KeyEvent *)&event, TRUE))
 	  {
 	    case KSYM_Return:
 	      result = 1;
@@ -5307,7 +5346,7 @@ int map_direction_EM_to_RND(int direction)
 
 int get_next_element(int element)
 {
-  switch(element)
+  switch (element)
   {
     case EL_QUICKSAND_FILLING:		return EL_QUICKSAND_FULL;
     case EL_QUICKSAND_EMPTYING:		return EL_QUICKSAND_EMPTY;