moved code to separate function

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 76122ed945fb2638caec5d3fe03a1414ffeda4dd..40ac8d37c5289442b6a76f12d963f279975be07b 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -3244,7 +3244,7 @@ static void AnimateEnvelopeRequest(int anim_mode, int action)
   boolean ffwd_delay = (tape.playing && tape.fast_forward);
   boolean no_delay = (tape.warp_forward);
   int delay_value = (ffwd_delay ? delay_value_fast : delay_value_normal);
-  int anim_delay_value = MAX(1, (no_delay ? 0 : delay_value + 500 * 0) / 2);
+  int anim_delay_value = MAX(1, (no_delay ? 0 : delay_value) / 2);
   DelayCounter anim_delay = { anim_delay_value };
 
   int tile_size = MAX(request.step_offset, 1);
@@ -4840,46 +4840,22 @@ static void DoRequestAfter(void)
     TapeDeactivateDisplayOn();
 }
 
-static boolean RequestDoor(char *text, unsigned int req_state)
+static void DrawRequestDoorText(char *text)
 {
-  int draw_buffer_last = GetDrawtoField();
-  unsigned int old_door_state = GetDoorState();
+  char *text_ptr = text;
   int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN;
   int font_nr = FONT_TEXT_2;
-  char *text_ptr;
-  int result;
   int ty;
 
+  // force DOOR font inside door area
+  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
+
   if (maxWordLengthInRequestString(text) > MAX_REQUEST_LINE_FONT1_LEN)
   {
     max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN;
     font_nr = FONT_TEXT_1;
   }
 
-  DoRequestBefore();
-
-  // draw released gadget before proceeding
-  // BackToFront();
-
-  if (old_door_state & DOOR_OPEN_1)
-  {
-    CloseDoor(DOOR_CLOSE_1);
-
-    // save old door content
-    BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
-              0 * DXSIZE, 0, DXSIZE, DYSIZE, 1 * DXSIZE, 0);
-  }
-
-  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
-
-  // clear door drawing field
-  DrawBackground(DX, DY, DXSIZE, DYSIZE);
-
-  // force DOOR font inside door area
-  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
-
-  // write text for request
   for (text_ptr = text, ty = 0; ty < MAX_REQUEST_LINES; ty++)
   {
     char text_line[max_request_line_len + 1];
@@ -4891,7 +4867,6 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++)
     {
       tc = *(text_ptr + tx);
-      // if (!tc || tc == ' ')
       if (!tc || tc == ' ' || tc == '?' || tc == '!')
        break;
     }
@@ -4914,10 +4889,36 @@ static boolean RequestDoor(char *text, unsigned int req_state)
             text_line, font_nr);
 
     text_ptr += tl + (tc == ' ' ? 1 : 0);
-    // text_ptr += tl + (tc == ' ' || tc == '?' || tc == '!' ? 1 : 0);
   }
 
   ResetFontStatus();
+}
+
+static boolean RequestDoor(char *text, unsigned int req_state)
+{
+  int draw_buffer_last = GetDrawtoField();
+  unsigned int old_door_state = GetDoorState();
+  int result;
+
+  DoRequestBefore();
+
+  if (old_door_state & DOOR_OPEN_1)
+  {
+    CloseDoor(DOOR_CLOSE_1);
+
+    // save old door content
+    BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
+              0, 0, DXSIZE, DYSIZE, DXSIZE, 0);
+  }
+
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+
+  // clear door drawing field
+  DrawBackground(DX, DY, DXSIZE, DYSIZE);
+
+  // write text for request
+  DrawRequestDoorText(text);
 
   MapToolButtons(req_state);
 
@@ -4926,8 +4927,6 @@ static boolean RequestDoor(char *text, unsigned int req_state)
 
   OpenDoor(DOOR_OPEN_1);
 
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
-
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state, draw_buffer_last);
 
@@ -4957,8 +4956,6 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
   DrawEnvelopeRequest(text, req_state);
   ShowEnvelopeRequest(text, req_state, ACTION_OPENING);
 
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
-
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state, draw_buffer_last);