X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=912b18360309377682654e9b9d831604eaaf0005;hb=e5804efb99033c96d71c37ce89f60e1ee23b7004;hp=f3f6a33bee60f968357a43a00d22eccc0db4cdf9;hpb=c8689f0335cd584d24570046c6eb5a3b75701305;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index f3f6a33b..912b1836 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -2925,11 +2925,11 @@ static void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
       for (xx = 0; xx < xsize; xx++)
 	DrawEnvelopeBackground(graphic, sx, sy, xx, yy, xsize, ysize, font_nr);
 
-    DrawTextBuffer(sx + font_width, sy + font_height,
-		   level.envelope[envelope_nr].text, font_nr, max_xsize,
-		   xsize - 2, ysize - 2, 0, mask_mode,
-		   level.envelope[envelope_nr].autowrap,
-		   level.envelope[envelope_nr].centered, FALSE);
+    DrawTextArea(sx + font_width, sy + font_height,
+		 level.envelope[envelope_nr].text, font_nr, max_xsize,
+		 xsize - 2, ysize - 2, 0, mask_mode,
+		 level.envelope[envelope_nr].autowrap,
+		 level.envelope[envelope_nr].centered, FALSE);
 
     redraw_mask |= REDRAW_FIELD;
     BackToFront();
@@ -5857,6 +5857,11 @@ void CreateToolButtons(void)
     int y = pos->y;
     int id = i;
 
+    // do not use touch buttons if touch controls are disabled
+    if (is_touch_button &&
+	strEqual(setup.touch.control_type, TOUCH_CONTROL_OFF))
+      continue;
+
     if (global.use_envelope_request && !is_touch_button)
     {
       setRequestPosition(&base_x, &base_y, TRUE);