added optional button to restart game (door, panel and touch variants)
[rocksndiamonds.git] / src / tools.c
index b366a6088c11f67e17eb00dfbee2993e305ee8a1..4083e77ea1ba9733746632ceeb8bc2c1182dea0c 100644 (file)
@@ -175,6 +175,7 @@ static struct XY xy_topdown[] =
 
 
 // forward declaration for internal use
+static void MapToolButtons(unsigned int);
 static void UnmapToolButtons(void);
 static void HandleToolButtons(struct GadgetInfo *);
 static int el_act_dir2crm(int, int, int);
@@ -645,9 +646,11 @@ void DrawMaskedBorderToTarget(int draw_target)
   }
 }
 
-void DrawTileCursor(int draw_target)
+void DrawTileCursor(int draw_target, int drawing_stage)
 {
-  DrawTileCursor_MM(draw_target, game_status == GAME_MODE_PLAYING);
+  int tile_cursor_active = (game_status == GAME_MODE_PLAYING);
+
+  DrawTileCursor_MM(draw_target, drawing_stage, tile_cursor_active);
 }
 
 void BlitScreenToBitmapExt_RND(Bitmap *target_bitmap, int fx, int fy)
@@ -1514,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
@@ -3053,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;
@@ -3066,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
@@ -3142,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;
@@ -3161,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;
@@ -3178,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;
@@ -3201,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
@@ -3214,55 +3252,27 @@ 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);
 
-  if (req_state & REQ_ASK)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_NO]);
-  }
-  else if (req_state & REQ_CONFIRM)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_CONFIRM]);
-  }
-  else if (req_state & REQ_PLAYER)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
-  }
+  MapToolButtons(req_state);
 
   // restore pointer to drawing buffer
   drawto = drawto_last;
 
   // 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)
 {
-  boolean game_just_ended = (game_status == GAME_MODE_PLAYING &&
-                            checkGameEnded());
+  boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
   int delay_value_normal = request.step_delay;
   int delay_value_fast = delay_value_normal / 2;
   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);
@@ -3305,7 +3315,7 @@ static void AnimateEnvelopeRequest(int anim_mode, int action)
     int dst_x, dst_y;
     int xx, yy;
 
-    if (game_just_ended)
+    if (game_ended)
       HandleGameActions();
 
     setRequestPosition(&src_x, &src_y, FALSE);
@@ -3357,8 +3367,6 @@ static void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
 
   if (action == ACTION_OPENING)
   {
-    DrawEnvelopeRequest(text, req_state);
-
     PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE);
 
     if (anim_mode == ANIM_DEFAULT)
@@ -4495,14 +4503,9 @@ void WaitForEventToContinue(void)
   }
 }
 
-#define MAX_REQUEST_LINES              13
-#define MAX_REQUEST_LINE_FONT1_LEN     7
-#define MAX_REQUEST_LINE_FONT2_LEN     10
-
 static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
 {
-  boolean game_just_ended = (game_status == GAME_MODE_PLAYING &&
-                            checkGameEnded());
+  boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
   int draw_buffer_last = GetDrawtoField();
   int width  = request.width;
   int height = request.height;
@@ -4518,7 +4521,7 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
 
   while (result < 0)
   {
-    if (game_just_ended)
+    if (game_ended)
     {
       SetDrawtoField(draw_buffer_game);
 
@@ -4610,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;
          }
 
@@ -4812,21 +4816,13 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
   return result;
 }
 
-static boolean RequestDoor(char *text, unsigned int req_state)
+static void DoRequestBefore(void)
 {
-  int draw_buffer_last = GetDrawtoField();
-  unsigned int old_door_state;
-  int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN;
-  int font_nr = FONT_TEXT_2;
-  char *text_ptr;
-  int result;
-  int ty;
+  boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
 
-  if (maxWordLengthInRequestString(text) > MAX_REQUEST_LINE_FONT1_LEN)
-  {
-    max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN;
-    font_nr = FONT_TEXT_1;
-  }
+  // when showing request dialog after game ended, deactivate game panel
+  if (game_ended)
+    game.panel.active = FALSE;
 
   if (game_status == GAME_MODE_PLAYING)
     BlitScreenToBitmap(backbuffer);
@@ -4840,41 +4836,89 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   // pause network game while waiting for request to answer
   if (network.enabled &&
       game_status == GAME_MODE_PLAYING &&
-      !game.all_players_gone &&
-      req_state & REQUEST_WAIT_FOR_INPUT)
+      !game.all_players_gone)
     SendToServer_PausePlaying();
 
-  old_door_state = GetDoorState();
-
   // simulate releasing mouse button over last gadget, if still pressed
   if (button_status)
     HandleGadgets(-1, -1, 0);
 
   UnmapAllGadgets();
+}
 
-  // draw released gadget before proceeding
-  // BackToFront();
+static void DoRequestAfter(void)
+{
+  RemapAllGadgets();
 
-  if (old_door_state & DOOR_OPEN_1)
+  if (game_status == GAME_MODE_PLAYING)
   {
-    CloseDoor(DOOR_CLOSE_1);
+    SetPanelBackground();
+    SetDrawBackgroundMask(REDRAW_DOOR_1);
+  }
+  else
+  {
+    SetDrawBackgroundMask(REDRAW_FIELD);
+  }
 
-    // save old door content
-    BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
-              0 * DXSIZE, 0, DXSIZE, DYSIZE, 1 * DXSIZE, 0);
+  // continue network game after request
+  if (network.enabled &&
+      game_status == GAME_MODE_PLAYING &&
+      !game.all_players_gone)
+    SendToServer_ContinuePlaying();
+
+  // restore deactivated drawing when quick-loading level tape recording
+  if (tape.playing && tape.deactivate_display)
+    TapeDeactivateDisplayOn();
+}
+
+static void setRequestDoorTextProperties(char *text,
+                                        int text_spacing,
+                                        int line_spacing,
+                                        int *set_font_nr,
+                                        int *set_max_lines,
+                                        int *set_max_line_length)
+{
+  struct RectWithBorder *vp_door_1 = &viewport.door_1[game_status];
+  struct TextPosInfo *pos = &request.button.confirm;
+  int button_ypos = pos->y;
+  int font_nr = FONT_TEXT_2;
+  int font_width = getFontWidth(font_nr);
+  int font_height = getFontHeight(font_nr);
+  int line_height = font_height + line_spacing;
+  int max_text_width  = vp_door_1->width;
+  int max_text_height = button_ypos - 2 * text_spacing;
+  int max_line_length = max_text_width  / font_width;
+  int max_lines       = max_text_height / line_height;
+
+  if (maxWordLengthInRequestString(text) > max_line_length)
+  {
+    font_nr = FONT_TEXT_1;
+    font_width = getFontWidth(font_nr);
+    max_line_length = max_text_width  / font_width;
   }
 
-  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+  *set_font_nr = font_nr;
+  *set_max_lines = max_lines;
+  *set_max_line_length = max_line_length;
+}
 
-  // clear door drawing field
-  DrawBackground(DX, DY, DXSIZE, DYSIZE);
+static void DrawRequestDoorText(char *text)
+{
+  char *text_ptr = text;
+  int text_spacing = 8;
+  int line_spacing = 2;
+  int max_request_lines;
+  int max_request_line_len;
+  int font_nr;
+  int ty;
 
   // 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++)
+  setRequestDoorTextProperties(text, text_spacing, line_spacing, &font_nr,
+                              &max_request_lines, &max_request_line_len);
+
+  for (text_ptr = text, ty = 0; ty < max_request_lines; ty++)
   {
     char text_line[max_request_line_len + 1];
     int tx, tl, tc = 0;
@@ -4885,7 +4929,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;
     }
@@ -4904,56 +4947,45 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     text_line[tl] = 0;
 
     DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2,
-            DY + 8 + ty * (getFontHeight(font_nr) + 2),
+            DY + text_spacing + ty * (getFontHeight(font_nr) + line_spacing),
             text_line, font_nr);
 
     text_ptr += tl + (tc == ' ' ? 1 : 0);
-    // text_ptr += tl + (tc == ' ' || tc == '?' || tc == '!' ? 1 : 0);
   }
 
   ResetFontStatus();
+}
 
-  if (req_state & REQ_ASK)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_NO]);
-  }
-  else if (req_state & REQ_CONFIRM)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_CONFIRM]);
-  }
-  else if (req_state & REQ_PLAYER)
+static int RequestDoor(char *text, unsigned int req_state)
+{
+  unsigned int old_door_state = GetDoorState();
+  int draw_buffer_last = GetDrawtoField();
+  int result;
+
+  if (old_door_state & DOOR_OPEN_1)
   {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
+    CloseDoor(DOOR_CLOSE_1);
+
+    // save old door content
+    BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
+              0, 0, DXSIZE, DYSIZE, DXSIZE, 0);
   }
 
-  // copy request gadgets to door backbuffer
-  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
-  OpenDoor(DOOR_OPEN_1);
+  // clear door drawing field
+  DrawBackground(DX, DY, DXSIZE, DYSIZE);
 
-  if (!(req_state & REQUEST_WAIT_FOR_INPUT))
-  {
-    if (game_status == GAME_MODE_PLAYING)
-    {
-      SetPanelBackground();
-      SetDrawBackgroundMask(REDRAW_DOOR_1);
-    }
-    else
-    {
-      SetDrawBackgroundMask(REDRAW_FIELD);
-    }
+  // write text for request
+  DrawRequestDoorText(text);
 
-    return FALSE;
-  }
+  MapToolButtons(req_state);
 
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+  // copy request gadgets to door backbuffer
+  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
+
+  OpenDoor(DOOR_OPEN_1);
 
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state, draw_buffer_last);
@@ -4969,85 +5001,17 @@ static boolean RequestDoor(char *text, unsigned int req_state)
       OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
   }
 
-  RemapAllGadgets();
-
-  if (game_status == GAME_MODE_PLAYING)
-  {
-    SetPanelBackground();
-    SetDrawBackgroundMask(REDRAW_DOOR_1);
-  }
-  else
-  {
-    SetDrawBackgroundMask(REDRAW_FIELD);
-  }
-
-  // continue network game after request
-  if (network.enabled &&
-      game_status == GAME_MODE_PLAYING &&
-      !game.all_players_gone &&
-      req_state & REQUEST_WAIT_FOR_INPUT)
-    SendToServer_ContinuePlaying();
-
-  // restore deactivated drawing when quick-loading level tape recording
-  if (tape.playing && tape.deactivate_display)
-    TapeDeactivateDisplayOn();
-
   return result;
 }
 
-static boolean RequestEnvelope(char *text, unsigned int req_state)
+static int RequestEnvelope(char *text, unsigned int req_state)
 {
   int draw_buffer_last = GetDrawtoField();
   int result;
 
-  if (game_status == GAME_MODE_PLAYING)
-    BlitScreenToBitmap(backbuffer);
-
-  // disable deactivated drawing when quick-loading level tape recording
-  if (tape.playing && tape.deactivate_display)
-    TapeDeactivateDisplayOff(TRUE);
-
-  SetMouseCursor(CURSOR_DEFAULT);
-
-  // pause network game while waiting for request to answer
-  if (network.enabled &&
-      game_status == GAME_MODE_PLAYING &&
-      !game.all_players_gone &&
-      req_state & REQUEST_WAIT_FOR_INPUT)
-    SendToServer_PausePlaying();
-
-  // simulate releasing mouse button over last gadget, if still pressed
-  if (button_status)
-    HandleGadgets(-1, -1, 0);
-
-  UnmapAllGadgets();
-
-  // (replace with setting corresponding request background)
-  // SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
-  // SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
-
-  // clear door drawing field
-  // DrawBackground(DX, DY, DXSIZE, DYSIZE);
-
+  DrawEnvelopeRequest(text, req_state);
   ShowEnvelopeRequest(text, req_state, ACTION_OPENING);
 
-  if (!(req_state & REQUEST_WAIT_FOR_INPUT))
-  {
-    if (game_status == GAME_MODE_PLAYING)
-    {
-      SetPanelBackground();
-      SetDrawBackgroundMask(REDRAW_DOOR_1);
-    }
-    else
-    {
-      SetDrawBackgroundMask(REDRAW_FIELD);
-    }
-
-    return FALSE;
-  }
-
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
-
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state, draw_buffer_last);
 
@@ -5055,52 +5019,27 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
 
   ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
 
-  RemapAllGadgets();
-
-  if (game_status == GAME_MODE_PLAYING)
-  {
-    SetPanelBackground();
-    SetDrawBackgroundMask(REDRAW_DOOR_1);
-  }
-  else
-  {
-    SetDrawBackgroundMask(REDRAW_FIELD);
-  }
-
-  // continue network game after request
-  if (network.enabled &&
-      game_status == GAME_MODE_PLAYING &&
-      !game.all_players_gone &&
-      req_state & REQUEST_WAIT_FOR_INPUT)
-    SendToServer_ContinuePlaying();
-
-  // restore deactivated drawing when quick-loading level tape recording
-  if (tape.playing && tape.deactivate_display)
-    TapeDeactivateDisplayOn();
-
   return result;
 }
 
-boolean Request(char *text, unsigned int req_state)
+int Request(char *text, unsigned int req_state)
 {
-  boolean game_just_ended = (game_status == GAME_MODE_PLAYING &&
-                            checkGameEnded());
   boolean overlay_enabled = GetOverlayEnabled();
-  boolean result;
-
-  // when showing request dialog after game ended, deactivate game panel
-  if (game_just_ended)
-    game.panel.active = FALSE;
+  int result;
 
   game.request_active = TRUE;
 
   SetOverlayEnabled(FALSE);
 
+  DoRequestBefore();
+
   if (global.use_envelope_request)
     result = RequestEnvelope(text, req_state);
   else
     result = RequestDoor(text, req_state);
 
+  DoRequestAfter();
+
   SetOverlayEnabled(overlay_enabled);
 
   game.request_active = FALSE;
@@ -5407,8 +5346,7 @@ unsigned int MoveDoor(unsigned int door_state)
 
   if (door_state & DOOR_ACTION)
   {
-    boolean game_just_ended = (game_status == GAME_MODE_PLAYING &&
-                              checkGameEnded());
+    boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
     boolean door_panel_drawn[NUM_DOORS];
     boolean panel_has_doors[NUM_DOORS];
     boolean door_part_skip[MAX_DOOR_PARTS];
@@ -5675,7 +5613,7 @@ unsigned int MoveDoor(unsigned int door_state)
 
       if (!(door_state & DOOR_NO_DELAY))
       {
-       if (game_just_ended)
+       if (game_ended)
          HandleGameActions();
 
        BackToFront();
@@ -5702,7 +5640,7 @@ unsigned int MoveDoor(unsigned int door_state)
 
       while (!DelayReached(&door_delay))
       {
-       if (game_just_ended)
+       if (game_ended)
          HandleGameActions();
 
        BackToFront();
@@ -5969,6 +5907,29 @@ void FreeToolButtons(void)
     FreeGadget(tool_gadget[i]);
 }
 
+static void MapToolButtons(unsigned int req_state)
+{
+  if (req_state & REQ_ASK)
+  {
+    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_YES]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_NO]);
+  }
+  else if (req_state & REQ_CONFIRM)
+  {
+    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_TOUCH_CONFIRM]);
+  }
+  else if (req_state & REQ_PLAYER)
+  {
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
+  }
+}
+
 static void UnmapToolButtons(void)
 {
   int i;