rnd-19981026-3

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index dc398df7fe5870ab51767fb52292154ff615a649..f360abd68334142d390b151a8aac28f8eac1fff2 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -409,14 +409,14 @@ void HandleKey(KeySym key, int key_status)
       if (key_status == KEY_PRESSED)
       {
        if (network_playing)
-         local_player->action |= key_action;
+         local_player->potential_action |= key_action;
        else
          stored_player[pnr].action |= key_action;
       }
       else
       {
        if (network_playing)
-         local_player->action &= ~key_action;
+         local_player->potential_action &= ~key_action;
        else
          stored_player[pnr].action &= ~key_action;
       }
@@ -720,6 +720,10 @@ void HandleKey(KeySym key, int key_status)
          local_player->dynamite = 1000;
          break;
 
+
+
+#if 0
+
        case XK_x:
 
          {
@@ -775,8 +779,6 @@ void HandleKey(KeySym key, int key_status)
 
          break;
 
-
-#if 0
        case XK_y:
          /*
          {
@@ -795,8 +797,6 @@ void HandleKey(KeySym key, int key_status)
          printf("direct_draw_on == %d\n", setup.direct_draw_on);
 
          break;
-#endif
-
 
        case XK_z:
          {
@@ -828,6 +828,7 @@ void HandleKey(KeySym key, int key_status)
          }
 
          break;
+#endif
 #endif
 
        default:
@@ -934,16 +935,6 @@ void HandleJoystick()
        return;
       }
 
-      /*
-      if (tape.pausing || AllPlayersGone)
-      {
-       int i;
-
-       for (i=0; i<MAX_PLAYERS; i++)
-         stored_player[i].action = 0;
-      }
-      */
-
       HandleGameActions();
       break;