X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=66e5ec642fd6fa4c88453257e7a22fd5fbe4f430;hb=5361c043c5668c9801b4682e0691d34ec428545f;hp=c002c78ebbd6588dafeb1e64a90da9f801ba67ae;hpb=b59a0eedca464cba38e8a6bcfae54db32ac6b15e;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index c002c78e..66e5ec64 100644
--- a/src/events.c
+++ b/src/events.c
@@ -176,6 +176,16 @@ void ClearEventQueue()
   }
 }
 
+void ClearPlayerAction()
+{
+  int i;
+
+  /* simulate key release events for still pressed keys */
+  key_joystick_mapping = 0;
+  for (i=0; i<MAX_PLAYERS; i++)
+    stored_player[i].action = 0;
+}
+
 void SleepWhileUnmapped()
 {
   boolean window_unmapped = TRUE;
@@ -269,16 +279,11 @@ void HandleFocusEvent(FocusChangeEvent *event)
 
   if (event->type == EVENT_FOCUSOUT)
   {
-    int i;
-
     KeyboardAutoRepeatOn();
     old_joystick_status = joystick.status;
     joystick.status = JOYSTICK_NOT_AVAILABLE;
 
-    /* simulate key release events for still pressed keys */
-    key_joystick_mapping = 0;
-    for (i=0; i<MAX_PLAYERS; i++)
-      stored_player[i].action = 0;
+    ClearPlayerAction();
   }
   else if (event->type == EVENT_FOCUSIN)
   {
@@ -418,6 +423,9 @@ void HandleKey(Key key, int key_status)
 
   if (game_status == PLAYING)
   {
+    /* only needed for single-step tape recording mode */
+    static boolean clear_button_2[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
+    static boolean bomb_placed[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
     int pnr;
 
     for (pnr=0; pnr<MAX_PLAYERS; pnr++)
@@ -434,10 +442,46 @@ void HandleKey(Key key, int key_status)
 	if (key == *key_info[i].key_custom)
 	  key_action |= key_info[i].action;
 
+      if (tape.single_step && clear_button_2[pnr])
+      {
+	stored_player[pnr].action &= ~KEY_BUTTON_2;
+	clear_button_2[pnr] = FALSE;
+      }
+
       if (key_status == KEY_PRESSED)
 	stored_player[pnr].action |= key_action;
       else
 	stored_player[pnr].action &= ~key_action;
+
+      if (tape.single_step && tape.recording && tape.pausing)
+      {
+	if (key_status == KEY_PRESSED &&
+	    (key_action & (KEY_MOTION | KEY_BUTTON_1)))
+	{
+	  TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+
+	  if (key_action & KEY_MOTION)
+	  {
+	    if (stored_player[pnr].action & KEY_BUTTON_2)
+	      bomb_placed[pnr] = TRUE;
+	  }
+	}
+	else if (key_status == KEY_RELEASED &&
+		 (key_action & KEY_BUTTON_2))
+	{
+	  if (!bomb_placed[pnr])
+	  {
+	    TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+
+	    stored_player[pnr].action |= KEY_BUTTON_2;
+	    clear_button_2[pnr] = TRUE;
+	  }
+
+	  bomb_placed[pnr] = FALSE;
+	}
+      }
+      else if (tape.recording && tape.pausing && (key_action & KEY_ACTION))
+	TapeTogglePause(TAPE_TOGGLE_MANUAL);
     }
   }
   else
@@ -465,7 +509,7 @@ void HandleKey(Key key, int key_status)
   if (key_status == KEY_RELEASED)
     return;
 
-  if ((key == KSYM_Return || key == KSYM_space) &&
+  if ((key == KSYM_Return || key == setup.shortcut.toggle_pause) &&
       game_status == PLAYING && AllPlayersGone)
   {
     CloseDoor(DOOR_CLOSE_1);
@@ -477,6 +521,7 @@ void HandleKey(Key key, int key_status)
   /* allow quick escape to the main menu with the Escape key */
   if (key == KSYM_Escape &&
       game_status != MAINMENU &&
+      game_status != PLAYING &&
       game_status != LEVELED &&
       game_status != CHOOSELEVEL &&
       game_status != SETUP)
@@ -486,13 +531,15 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
-  /* special shortcuts for quick game tape saving and loading */
+  /* special key shortcuts */
   if (game_status == MAINMENU || game_status == PLAYING)
   {
     if (key == setup.shortcut.save_game)
       TapeQuickSave();
     else if (key == setup.shortcut.load_game)
       TapeQuickLoad();
+    else if (key == setup.shortcut.toggle_pause)
+      TapeTogglePause(TAPE_TOGGLE_MANUAL);
   }
 
 
@@ -519,7 +566,6 @@ void HandleKey(Key key, int key_status)
       switch(key)
       {
 	case KSYM_Return:
-	case KSYM_space:
 	  if (game_status == MAINMENU)
 	    HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
           else if (game_status == CHOOSELEVEL)
@@ -564,7 +610,6 @@ void HandleKey(Key key, int key_status)
       switch(key)
       {
 	case KSYM_Return:
-	case KSYM_space:
 	  game_status = MAINMENU;
 	  DrawMainMenu();
 	  BackToFront();
@@ -592,6 +637,9 @@ void HandleKey(Key key, int key_status)
     {
       switch(key)
       {
+        case KSYM_Escape:
+	  RequestQuitGame(setup.ask_on_escape);
+	  break;
 
 #ifdef DEBUG
 	case KSYM_0:
@@ -767,11 +815,9 @@ static int HandleJoystickForAllPlayers()
     joy_action = Joystick(i);
     result |= joy_action;
 
-
     if (!setup.input[i].use_joystick)
       continue;
 
-
     stored_player[i].action = joy_action;
   }