X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=4d7a7a36d68ee479fb0b8c1644c6935f5a5212cf;hb=5c717898f717007b885f86e0d02f10d2a0306237;hp=c45581e549df5f0354e4a291aad9c08d059c5b54;hpb=a606b4bf796ba79cea7633dabb28484b6233b5c1;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index c45581e5..4d7a7a36 100644
--- a/src/events.c
+++ b/src/events.c
@@ -566,7 +566,6 @@ static void HandleKeysSpecial(Key key)
 
 void HandleKey(Key key, int key_status)
 {
-  int joy = 0;
   boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive();
   static struct SetupKeyboardInfo custom_key;
   static struct
@@ -583,6 +582,8 @@ void HandleKey(Key key, int key_status)
     { &custom_key.snap,  DEFAULT_KEY_SNAP,  JOY_BUTTON_1 },
     { &custom_key.drop,  DEFAULT_KEY_DROP,  JOY_BUTTON_2 }
   };
+  int joy = 0;
+  int i;
 
   if (game_status == GAME_MODE_PLAYING)
   {
@@ -593,7 +594,6 @@ void HandleKey(Key key, int key_status)
 
     for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
     {
-      int i;
       byte key_action = 0;
 
       if (setup.input[pnr].use_joystick)
@@ -649,8 +649,6 @@ void HandleKey(Key key, int key_status)
   }
   else
   {
-    int i;
-
     for (i = 0; i < 6; i++)
       if (key == key_info[i].key_default)
 	joy |= key_info[i].action;
@@ -700,6 +698,16 @@ void HandleKey(Key key, int key_status)
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
   }
 
+  if (game_status == GAME_MODE_PLAYING)
+  {
+    if (key == setup.shortcut.focus_player_all)
+      game.centered_player_nr_next = -1;
+    else
+      for (i = 0; i < MAX_PLAYERS; i++)
+	if (key == setup.shortcut.focus_player[i])
+	  game.centered_player_nr_next = i;
+  }
+
   HandleKeysSpecial(key);
 
   if (HandleGadgetsKeyInput(key))
@@ -813,6 +821,7 @@ void HandleKey(Key key, int key_status)
 
 #ifdef DEBUG
 	case KSYM_0:
+#if 0
 	case KSYM_1:
 	case KSYM_2:
 	case KSYM_3:
@@ -822,6 +831,7 @@ void HandleKey(Key key, int key_status)
 	case KSYM_7:
 	case KSYM_8:
 	case KSYM_9:
+#endif
 	  if (key == KSYM_0)
 	  {
 	    if (GameFrameDelay == 500)