X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=f89b2b250eeebc8a7d087043e05e344ce6fc2f0c;hb=HEAD;hp=c000d097f9a5d0110bfb589a1975829599ab1340;hpb=21f34b5bebb5acc7f43a0dff5d4883775591c359;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index c000d097..4083e77e 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1517,6 +1517,11 @@ void SetRandomAnimationValue(int x, int y)
   gfx.anim_random_frame = GfxRandom[x][y];
 }
 
+void SetAnimationFirstLevel(int first_level)
+{
+  gfx.anim_first_level = first_level;
+}
+
 int getGraphicAnimationFrame(int graphic, int sync_frame)
 {
   // animation synchronized with global frame counter, not move position
@@ -3056,6 +3061,8 @@ static void PrepareEnvelopeRequestToScreen(Bitmap *bitmap, int sx, int sy,
   SDLFreeBitmapTextures(request.bitmap);
   SDLCreateBitmapTextures(request.bitmap);
 
+  ResetBitmapAlpha(request.bitmap);
+
   // set envelope request run-time values
   request.sx = sx;
   request.sy = sy;
@@ -3069,7 +3076,11 @@ void DrawEnvelopeRequestToScreen(int drawing_target)
       game.request_active &&
       drawing_target == DRAW_TO_SCREEN)
   {
-    if (graphic_info[IMG_BACKGROUND_REQUEST].draw_masked)
+    struct GraphicInfo *g = &graphic_info[IMG_BACKGROUND_REQUEST];
+
+    SetBitmapAlphaNextBlit(request.bitmap, g->alpha);
+
+    if (g->draw_masked)
       BlitToScreenMasked(request.bitmap, 0, 0, request.xsize, request.ysize,
 			 request.sx, request.sy);
     else
@@ -3145,9 +3156,8 @@ static void setRequestPosition(int *x, int *y, boolean add_border_size)
   setRequestPositionExt(x, y, request.width, request.height, add_border_size);
 }
 
-static void DrawEnvelopeRequest(char *text, unsigned int req_state)
+static void DrawEnvelopeRequestText(int sx, int sy, char *text)
 {
-  DrawBuffer *drawto_last = drawto;
   char *text_final = text;
   char *text_door_style = NULL;
   int graphic = IMG_BACKGROUND_REQUEST;
@@ -3164,15 +3174,11 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
   int line_length = max_text_width  / font_width;
   int max_lines   = max_text_height / line_height;
   int text_width = line_length * font_width;
-  int width = request.width;
-  int height = request.height;
-  int tile_size = MAX(request.step_offset, 1);
-  int x_steps = width  / tile_size;
-  int y_steps = height / tile_size;
   int sx_offset = border_size;
   int sy_offset = border_size;
-  int sx, sy;
-  int x, y;
+
+  // force DOOR font inside door area
+  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
 
   if (request.centered)
     sx_offset = (request.width - text_width) / 2;
@@ -3181,6 +3187,13 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
   {
     char *src_text_ptr, *dst_text_ptr;
 
+    if (maxWordLengthInRequestString(text) > line_length)
+    {
+      font_nr = FONT_REQUEST_NARROW;
+      font_width = getFontWidth(font_nr);
+      line_length = max_text_width  / font_width;
+    }
+
     text_door_style = checked_malloc(2 * strlen(text) + 1);
 
     src_text_ptr = text;
@@ -3204,6 +3217,28 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
     text_final = text_door_style;
   }
 
+  DrawTextBuffer(sx + sx_offset, sy + sy_offset, text_final, font_nr,
+		 line_length, -1, max_lines, line_spacing, mask_mode,
+		 request.autowrap, request.centered, FALSE);
+
+  if (text_door_style)
+    free(text_door_style);
+
+  ResetFontStatus();
+}
+
+static void DrawEnvelopeRequest(char *text, unsigned int req_state)
+{
+  DrawBuffer *drawto_last = drawto;
+  int graphic = IMG_BACKGROUND_REQUEST;
+  int width = request.width;
+  int height = request.height;
+  int tile_size = MAX(request.step_offset, 1);
+  int x_steps = width  / tile_size;
+  int y_steps = height / tile_size;
+  int sx, sy;
+  int x, y;
+
   setRequestPosition(&sx, &sy, FALSE);
 
   // draw complete envelope request to temporary bitmap
@@ -3217,14 +3252,8 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
 				  x, y, x_steps, y_steps,
 				  tile_size, tile_size);
 
-  // force DOOR font inside door area
-  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
-
-  DrawTextBuffer(sx + sx_offset, sy + sy_offset, text_final, font_nr,
-		 line_length, -1, max_lines, line_spacing, mask_mode,
-		 request.autowrap, request.centered, FALSE);
-
-  ResetFontStatus();
+  // write text for request
+  DrawEnvelopeRequestText(sx, sy, text);
 
   MapToolButtons(req_state);
 
@@ -3233,9 +3262,6 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
 
   // prepare complete envelope request from temporary bitmap
   PrepareEnvelopeRequestToScreen(bitmap_db_store_1, sx, sy, width, height);
-
-  if (text_door_style)
-    free(text_door_style);
 }
 
 static void AnimateEnvelopeRequest(int anim_mode, int action)
@@ -4587,11 +4613,12 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
 		break;
 
 	      default:
-		// only check clickable animations if no request gadget clicked
-		HandleGlobalAnimClicks(mx, my, button_status, FALSE);
 		break;
 	    }
 
+	    // only needed to handle clickable pointer animations here
+	    HandleGlobalAnimClicks(mx, my, button_status, FALSE);
+
 	    break;
 	  }