X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Ftext.c;h=94e4c3c9c5d8531319030f5d65a150c72908b06f;hb=c4dd9e14b72b528e82bc018fe2fa76b784221584;hp=6fd437359014dad05bcacdf93216028f74cab43b;hpb=b645a25fff77d62a36c744fa4047a3c0e5929341;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 6fd43735..94e4c3c9 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -255,6 +255,11 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
   struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
   int font_width = getFontWidth(font_nr);
   int font_height = getFontHeight(font_nr);
+#if 0
+  int border_1 = gfx.sx + gfx.sxsize;
+  int border_2 = gfx.dx + gfx.dxsize;
+  int dst_x_start = dst_x;
+#endif
   Bitmap *src_bitmap;
   int src_x, src_y;
   char *text_ptr = text;
@@ -262,6 +267,10 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
   if (font->bitmap == NULL)
     return;
 
+  /* skip text to be printed outside the window (left/right will be clipped) */
+  if (dst_y < 0 || dst_y + font_height > video.height)
+    return;
+
   /* add offset for drawing font characters */
   dst_x += font->draw_x;
   dst_y += font->draw_y;
@@ -275,6 +284,25 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
 
     getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
 
+    /* clip text at the left side of the window */
+    if (dst_x < 0)
+    {
+      dst_x += font_width;
+
+      continue;
+    }
+
+    /* clip text at the right side of the window */
+#if 1
+    if (dst_x + font_width > video.width)
+      break;
+#else
+    /* (this does not work well when trying to print text to whole screen) */
+    if ((dst_x_start < border_1 && dst_x + font_width > border_1) ||
+	(dst_x_start < border_2 && dst_x + font_width > border_2))
+      break;
+#endif
+
     if (mask_mode == BLIT_INVERSE)	/* special mode for text gadgets */
     {
       /* first step: draw solid colored rectangle (use "cursor" character) */