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 6f6d41faa580f6ddf393613752fcb6434c91e725..b450c2b0d547a79f587da1a82cd8821ed83bb86f 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -1560,9 +1560,6 @@ void HandleKey(Key key, int key_status)
     static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
     int pnr;
 
     static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
     int pnr;
 

-    /* initialize unifying snap and drop buttons (EM engine) */
-    game_em.use_single_button = game_em.use_single_button_initial;
-

     for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
     {
       byte key_action = 0;
     for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
     {
       byte key_action = 0;


@@ -1609,9 +1606,6 @@ void HandleKey(Key key, int key_status)
 
       if (tape.single_step && tape.recording && tape.pausing)
       {
 
       if (tape.single_step && tape.recording && tape.pausing)
       {

-       /* do not unify snap and drop buttons in single-step mode (EM engine) */
-       game_em.use_single_button = FALSE;
-

        if (key_status == KEY_PRESSED && key_action & KEY_MOTION)
        {
          TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
        if (key_status == KEY_PRESSED && key_action & KEY_MOTION)
        {
          TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);


@@ -1629,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;