X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=13723bfa514da9ff8f78e499946907ad7d4729bd;hb=8ca1cd4ae397da6b91d425aac0b3a40d302b66c2;hp=2bc1aff077847a132313588f3c9959ea1fe5571f;hpb=afbcadc683ad6307c3a9cdbf1d7f3f247690a1b1;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 2bc1aff0..13723bfa 100644
--- a/src/events.c
+++ b/src/events.c
@@ -108,7 +108,7 @@ static int FilterEvents(const Event *event)
     {
       SetMouseCursor(CURSOR_DEFAULT);
 
-      DelayReached(&special_cursor_delay, 0);
+      ResetDelayCounter(&special_cursor_delay);
 
       cursor_mode_last = CURSOR_DEFAULT;
     }
@@ -336,7 +336,7 @@ static void HandleMouseCursor(void)
 
     // display normal pointer if mouse pressed
     if (button_status != MB_RELEASED)
-      DelayReached(&special_cursor_delay, 0);
+      ResetDelayCounter(&special_cursor_delay);
 
     if (gfx.cursor_mode != CURSOR_PLAYFIELD &&
 	cursor_inside_playfield &&
@@ -1476,7 +1476,7 @@ void HandleKeyEvent(KeyEvent *event)
     if (key_status == KEY_PRESSED)
       SetOverlayEnabled(!GetOverlayEnabled());
   }
-  else
+  else if (!textinput_status)
   {
     // for any other "real" key event, disable virtual buttons
     SetOverlayEnabled(FALSE);
@@ -2091,6 +2091,8 @@ void HandleKey(Key key, int key_status)
 	  {
 	    key_action      |= key_info[i].action | JOY_BUTTON_SNAP;
 	    key_snap_action |= key_info[i].action;
+
+	    tape.property_bits |= TAPE_PROPERTY_TAS_KEYS;
 	  }
 	}
       }
@@ -2411,7 +2413,7 @@ void HandleKey(Key key, int key_status)
       switch (key)
       {
         case KSYM_Escape:
-	  RequestQuitGame(setup.ask_on_escape);
+	  RequestQuitGame(TRUE);
 	  break;
 
 	default: