fixed bug in single button handling causing broken tapes (EM engine)

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 6671041620077893cc02078bc6a72725057c0f64..b450c2b0d547a79f587da1a82cd8821ed83bb86f 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -378,6 +378,8 @@ void ClearPlayerAction()
   key_joystick_mapping = 0;
   for (i = 0; i < MAX_PLAYERS; i++)
     stored_player[i].action = 0;
   key_joystick_mapping = 0;
   for (i = 0; i < MAX_PLAYERS; i++)
     stored_player[i].action = 0;

+
+  ClearJoystickState();

 }
 
 void SleepWhileUnmapped()
 }
 
 void SleepWhileUnmapped()


@@ -1621,7 +1623,6 @@ void HandleKey(Key key, int key_status)
          if (level.game_engine_type == GAME_ENGINE_TYPE_EM ||
              level.game_engine_type == GAME_ENGINE_TYPE_SP)
          {
          if (level.game_engine_type == GAME_ENGINE_TYPE_EM ||
              level.game_engine_type == GAME_ENGINE_TYPE_SP)
          {

-

            if (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
                getRedDiskReleaseFlag_SP() == 0)
              stored_player[pnr].action &= ~KEY_BUTTON_DROP;
            if (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
                getRedDiskReleaseFlag_SP() == 0)
              stored_player[pnr].action &= ~KEY_BUTTON_DROP;