added clearing event queue after fading and after door/envelope requests

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 4fed1cd982a7223367deaee0ce8e1b2c26cb6327..ab6c4efa28f32b808b095e4955afc0966798750a 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -981,6 +981,8 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
                draw_border_function);
 
   redraw_mask &= ~fade_mask;
+
+  ClearEventQueue();
 }
 
 static void SetScreenStates_BeforeFadingIn()
@@ -2800,6 +2802,8 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
 
     SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
   }
+
+  ClearEventQueue();
 }
 
 void ShowEnvelope(int envelope_nr)
@@ -3083,6 +3087,8 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
 
     SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
   }
+
+  ClearEventQueue();
 }
 
 void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
@@ -3623,7 +3629,7 @@ void DrawNetworkPlayersExt(boolean force)
 
   struct TextPosInfo *pos = &menu.main.network_players;
   int tile_size = pos->tile_size;
-  int border_size = 2;
+  int border_size = pos->border_size;
   int xoffset_text = tile_size + border_size;
   int font_nr = pos->font;
   int font_width = getFontWidth(font_nr);
@@ -5419,6 +5425,8 @@ unsigned int MoveDoor(unsigned int door_state)
   DrawMaskedBorder(REDRAW_DOOR_1);
   DrawMaskedBorder(REDRAW_DOOR_2);
 
+  ClearEventQueue();
+
   return (door1 | door2);
 }