rocksndiamonds-3.1.2
[rocksndiamonds.git] / src / game.c
index 23667a16aec7298aaabe1f4c5748af5b3152daa1..b0d7ec6bfd1a670820bce99d0111fd67b8c7db58 100644 (file)
 
 #define USE_CHANGE_TO_TRIGGERED                (TRUE   * USE_NEW_STUFF         * 1)
 
-#define USE_BACK_WALKABLE_BUGFIX       (TRUE   * USE_NEW_STUFF         * 1)
-
-#define TEST_NEW_STUFF                 (TRUE)
-
 
 /* for DigField() */
 #define DF_NO_PUSH             0
                                 RND(element_info[e].move_delay_random))
 #define GET_MAX_MOVE_DELAY(e)  (   (element_info[e].move_delay_fixed) + \
                                    (element_info[e].move_delay_random))
-#define GET_CHANGE_DELAY(c)    (   ((c)->delay_fixed  * (c)->delay_frames) + \
-                                RND((c)->delay_random * (c)->delay_frames))
 
 #define GET_TARGET_ELEMENT(e, ch)                                      \
        ((e) == EL_TRIGGER_ELEMENT ? (ch)->actual_trigger_element :     \
@@ -371,9 +365,9 @@ static boolean CheckElementChangeExt(int, int, int, int, int, int, int, int);
 #define CheckElementChange(x, y, e, te, ev)                            \
        CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, CH_SIDE_ANY, -1)
 #define CheckElementChangeByPlayer(x, y, e, ev, p, s)                  \
-       CheckElementChangeExt(x, y, e, EL_EMPTY, ev, p, s, -1)
+       CheckElementChangeExt(x, y, e, EL_EMPTY, ev, p, s, CH_PAGE_ANY)
 #define CheckElementChangeBySide(x, y, e, te, ev, s)                   \
-       CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, s, -1)
+       CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, s, CH_PAGE_ANY)
 #define CheckElementChangeByPage(x, y, e, te, ev, p)                   \
        CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, CH_SIDE_ANY, p)
 
@@ -1134,15 +1128,9 @@ inline void DrawGameValue_Keys(int key[MAX_NUM_KEYS])
 
   /* currently only 4 of 8 possible keys are displayed */
   for (i = 0; i < STD_NUM_KEYS; i++)
-  {
     if (key[i])
       DrawMiniGraphicExt(drawto, DX_KEYS + i * MINI_TILEX, DY_KEYS,
                         el2edimg(EL_KEY_1 + i));
-    else
-      BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-                DOOR_GFX_PAGEX5 + XX_KEYS + i * MINI_TILEX, YY_KEYS,
-                MINI_TILEX, MINI_TILEY, DX_KEYS + i * MINI_TILEX, DY_KEYS);
-  }
 }
 
 inline void DrawGameValue_Score(int value)
@@ -1495,20 +1483,6 @@ static void InitGameEngine()
   }
 #endif
 
-  /* ---------- initialize internal run-time variables ------------- */
-
-  for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
-  {
-    struct ElementInfo *ei = &element_info[EL_CUSTOM_START + i];
-
-    for (j = 0; j < ei->num_change_pages; j++)
-    {
-      ei->change_page[j].can_change_or_has_action =
-       (ei->change_page[j].can_change |
-        ei->change_page[j].has_action);
-    }
-  }
-
   /* ---------- initialize run-time trigger player and element ------------- */
 
   for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
@@ -2212,8 +2186,7 @@ void InitGame()
 #endif
   }
 
-  if (!game.restart_level)
-    CloseDoor(DOOR_CLOSE_1);
+  CloseDoor(DOOR_CLOSE_1);
 
   /* !!! FIX THIS (START) !!! */
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
@@ -2237,48 +2210,40 @@ void InitGame()
   }
   /* !!! FIX THIS (END) !!! */
 
-  if (!game.restart_level)
-  {
-    /* copy default game door content to main double buffer */
-    BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-              DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
-  }
+  /* copy default game door content to main double buffer */
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
+            DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
   DrawGameDoorValues();
 
-  if (!game.restart_level)
-  {
-    UnmapGameButtons();
-    UnmapTapeButtons();
-    game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music;
-    game_gadget[SOUND_CTRL_ID_LOOPS]->checked = setup.sound_loops;
-    game_gadget[SOUND_CTRL_ID_SIMPLE]->checked = setup.sound_simple;
-    MapGameButtons();
-    MapTapeButtons();
+  UnmapGameButtons();
+  UnmapTapeButtons();
+  game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music;
+  game_gadget[SOUND_CTRL_ID_LOOPS]->checked = setup.sound_loops;
+  game_gadget[SOUND_CTRL_ID_SIMPLE]->checked = setup.sound_simple;
+  MapGameButtons();
+  MapTapeButtons();
 
-    /* copy actual game door content to door double buffer for OpenDoor() */
-    BlitBitmap(drawto, bitmap_db_door,
-              DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+  /* copy actual game door content to door double buffer for OpenDoor() */
+  BlitBitmap(drawto, bitmap_db_door,
+            DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
-    OpenDoor(DOOR_OPEN_ALL);
+  OpenDoor(DOOR_OPEN_ALL);
 
-    PlaySoundStereo(SND_GAME_STARTING, SOUND_MIDDLE);
+  PlaySoundStereo(SND_GAME_STARTING, SOUND_MIDDLE);
 
-    if (setup.sound_music)
-      PlayLevelMusic();
+  if (setup.sound_music)
+    PlayLevelMusic();
 
-    KeyboardAutoRepeatOffUnlessAutoplay();
+  KeyboardAutoRepeatOffUnlessAutoplay();
 
-    if (options.debug)
-    {
-      for (i = 0; i < MAX_PLAYERS; i++)
-       printf("Player %d %sactive.\n",
-              i + 1, (stored_player[i].active ? "" : "not "));
-    }
+  if (options.debug)
+  {
+    for (i = 0; i < MAX_PLAYERS; i++)
+      printf("Player %d %sactive.\n",
+            i + 1, (stored_player[i].active ? "" : "not "));
   }
 
-  game.restart_level = FALSE;
-
 #if 0
   printf("::: starting game [%d]\n", FrameCounter);
 #endif
@@ -7892,309 +7857,7 @@ static void ChangeActiveTrap(int x, int y)
     DrawLevelFieldCrumbledSand(x, y);
 }
 
-static int getSpecialActionElement(int element, int number, int base_element)
-{
-  return (element != EL_EMPTY ? element :
-         number != -1 ? base_element + number - 1 :
-         EL_EMPTY);
-}
-
-static int getModifiedActionNumber(int value_old, int value_min, int value_max,
-                                  int operator, int operand)
-{
-  int value_new = (operator == CA_MODE_ADD      ? value_old + operand :
-                  operator == CA_MODE_SUBTRACT ? value_old - operand :
-                  operator == CA_MODE_MULTIPLY ? value_old * operand :
-                  operator == CA_MODE_DIVIDE   ? value_old / MAX(1, operand) :
-                  operator == CA_MODE_SET      ? operand :
-                  value_old);
-
-  return (value_new < value_min ? value_min :
-         value_new > value_max ? value_max :
-         value_new);
-}
-
-static void ExecuteCustomElementAction(int element, int page)
-{
-  struct ElementInfo *ei = &element_info[element];
-  struct ElementChangeInfo *change = &ei->change_page[page];
-  int action_type = change->action_type;
-  int action_mode = change->action_mode;
-  int action_arg = change->action_arg;
-  int i;
-
-  if (!change->has_action)
-    return;
-
-  /* ---------- determine action paramater values ---------- */
-
-  int action_arg_element =
-    (action_arg == CA_ARG_PLAYER_TRIGGER  ? change->actual_trigger_player :
-     action_arg == CA_ARG_ELEMENT_TRIGGER ? change->actual_trigger_element :
-     action_arg == CA_ARG_ELEMENT_TARGET  ? change->target_element :
-     EL_EMPTY);
-
-  int action_arg_number =
-    (action_arg <= CA_ARG_MAX ? action_arg :
-     action_arg == CA_ARG_NUMBER_MIN ? CA_ARG_MIN :
-     action_arg == CA_ARG_NUMBER_MAX ? CA_ARG_MAX :
-     action_arg == CA_ARG_NUMBER_CE_SCORE ? ei->collect_score :
-     action_arg == CA_ARG_NUMBER_CE_COUNT ? ei->collect_count :
-     action_arg == CA_ARG_NUMBER_CE_DELAY ? GET_CHANGE_DELAY(change) :
-     -1);
-
-  /* (for explicit player choice, set invalid value to "no player") */
-  int action_arg_player_bits =
-    (action_arg == CA_ARG_PLAYER_ANY ? action_arg - CA_ARG_PLAYER :
-     action_arg >= CA_ARG_PLAYER_1 &&
-     action_arg <= CA_ARG_PLAYER_4 ? action_arg - CA_ARG_PLAYER :
-     action_arg >= CA_ARG_1 &&
-     action_arg <= CA_ARG_PLAYER_4 ? (1 << (action_arg - 1)) :
-     action_arg_element >= EL_PLAYER_1 &&
-     action_arg_element <= EL_PLAYER_4 ?
-     (1 << (action_arg_element - EL_PLAYER_1)) :
-     0);
-
-  /* (for implicit player choice, set invalid value to "all players") */
-  int trigger_player_bits =
-    (change->actual_trigger_player >= EL_PLAYER_1 &&
-     change->actual_trigger_player <= EL_PLAYER_4 ?
-     (1 << (change->actual_trigger_player - EL_PLAYER_1)) :
-     PLAYER_BITS_ANY);
-
-  /* ---------- execute action  ---------- */
-
-  switch(action_type)
-  {
-    case CA_NO_ACTION:
-    {
-      return;
-    }
-
-    case CA_EXIT_PLAYER:
-    {
-      for (i = 0; i < MAX_PLAYERS; i++)
-       if (action_arg_player_bits & (1 << i))
-         stored_player[i].LevelSolved = stored_player[i].GameOver = TRUE;
-
-      break;
-    }
-
-    case CA_KILL_PLAYER:
-    {
-      for (i = 0; i < MAX_PLAYERS; i++)
-       if (action_arg_player_bits & (1 << i))
-         KillHero(&stored_player[i]);
-
-      break;
-    }
-
-    case CA_RESTART_LEVEL:
-    {
-      game.restart_level = TRUE;
-
-      break;
-    }
-
-    case CA_SHOW_ENVELOPE:
-    {
-      int element = getSpecialActionElement(action_arg_element,
-                                           action_arg_number, EL_ENVELOPE_1);
-
-      if (IS_ENVELOPE(element))
-       local_player->show_envelope = element;
-
-      break;
-    }
-
-    case CA_ADD_KEY:
-    {
-      int element = getSpecialActionElement(action_arg_element,
-                                           action_arg_number, EL_KEY_1);
-
-      if (IS_KEY(element))
-      {
-       for (i = 0; i < MAX_PLAYERS; i++)
-       {
-         if (trigger_player_bits & (1 << i))
-         {
-           stored_player[i].key[KEY_NR(element)] = TRUE;
-
-           DrawGameValue_Keys(stored_player[i].key);
-
-           redraw_mask |= REDRAW_DOOR_1;
-         }
-       }
-      }
-
-      break;
-    }
-
-    case CA_DEL_KEY:
-    {
-      int element = getSpecialActionElement(action_arg_element,
-                                           action_arg_number, EL_KEY_1);
-
-      if (IS_KEY(element))
-      {
-       for (i = 0; i < MAX_PLAYERS; i++)
-       {
-         if (trigger_player_bits & (1 << i))
-         {
-           stored_player[i].key[KEY_NR(element)] = FALSE;
-
-           DrawGameValue_Keys(stored_player[i].key);
-
-           redraw_mask |= REDRAW_DOOR_1;
-         }
-       }
-      }
-
-      break;
-    }
-
-    case CA_SET_PLAYER_SPEED:
-    {
-      for (i = 0; i < MAX_PLAYERS; i++)
-      {
-       if (trigger_player_bits & (1 << i))
-       {
-         if (action_arg == CA_ARG_NUMBER_RESET)
-           stored_player[i].move_delay_value = game.initial_move_delay_value;
-         else if (action_arg == CA_ARG_NUMBER_NORMAL)
-           stored_player[i].move_delay_value = MOVE_DELAY_NORMAL_SPEED;
-         else if (action_arg == CA_ARG_NUMBER_MIN)
-           stored_player[i].move_delay_value = 16;
-         else if (action_arg == CA_ARG_NUMBER_MAX)
-           stored_player[i].move_delay_value = MOVE_DELAY_HIGH_SPEED;
-         else
-         {
-#if 0
-           if (action_mode == CA_MODE_ADD)
-           {
-             action_mode = CA_MODE_DIVIDE;
-             action_arg_number = (1 << action_arg_number);
-           }
-           else if (action_mode == CA_MODE_SUBTRACT)
-           {
-             action_mode = CA_MODE_MULTIPLY;
-             action_arg_number = (1 << action_arg_number);
-           }
-
-           int mode = (action_mode == CA_MODE_MULTIPLY ? CA_MODE_DIVIDE :
-                       action_mode == CA_MODE_DIVIDE   ? CA_MODE_MULTIPLY :
-                       action_mode);
-
-           stored_player[i].move_delay_value =
-             getModifiedActionNumber(stored_player[i].move_delay_value,
-                                     1, 16,
-                                     action_mode, action_arg_number);
-#endif
-         }
-       }
-      }
-
-      break;
-    }
-
-    case CA_SET_GEMS:
-    {
-      local_player->gems_still_needed =
-       getModifiedActionNumber(local_player->gems_still_needed, 0, 999,
-                               action_mode, action_arg_number);
-
-      DrawGameValue_Emeralds(local_player->gems_still_needed);
-
-      break;
-    }
-
-    case CA_SET_TIME:
-    {
-      if (level.time > 0)      /* only modify limited time value */
-      {
-       TimeLeft = getModifiedActionNumber(TimeLeft, 0, 9999,
-                                          action_mode, action_arg_number);
-
-       DrawGameValue_Time(TimeLeft);
-      }
-
-      break;
-    }
-
-    case CA_SET_SCORE:
-    {
-      local_player->score =
-       getModifiedActionNumber(local_player->score, 0, 99999,
-                               action_mode, action_arg_number);
-
-      DrawGameValue_Score(local_player->score);
-
-      break;
-    }
-
-    case CA_SET_CE_SCORE:
-    {
-      printf("::: CA_SET_CE_SCORE -- not yet implemented\n");
-
-      break;
-    }
-
-    case CA_SET_CE_COUNT:
-    {
-      printf("::: CA_SET_CE_COUNT -- not yet implemented\n");
-
-      break;
-    }
-
-    case CA_SET_DYNABOMB_NUMBER:
-    {
-      printf("::: CA_SET_DYNABOMB_NUMBER -- not yet implemented\n");
-
-      break;
-    }
-
-    case CA_SET_DYNABOMB_SIZE:
-    {
-      printf("::: CA_SET_DYNABOMB_SIZE -- not yet implemented\n");
-
-      break;
-    }
-
-    case CA_SET_DYNABOMB_POWER:
-    {
-      printf("::: CA_SET_DYNABOMB_POWER -- not yet implemented\n");
-
-      break;
-    }
-
-    case CA_TOGGLE_PLAYER_GRAVITY:
-    {
-      game.gravity = !game.gravity;
-
-      break;
-    }
-
-    case CA_ENABLE_PLAYER_GRAVITY:
-    {
-      game.gravity = TRUE;
-
-      break;
-    }
-
-    case CA_DISABLE_PLAYER_GRAVITY:
-    {
-      game.gravity = FALSE;
-
-      break;
-    }
-
-    default:
-      break;
-  }
-}
-
-static void ChangeElementNowExt(struct ElementChangeInfo *change,
-                               int x, int y, int target_element)
+static void ChangeElementNowExt(int x, int y, int target_element)
 {
   int previous_move_direction = MovDir[x][y];
 #if 1
@@ -8281,11 +7944,6 @@ static void ChangeElementNowExt(struct ElementChangeInfo *change,
   TestIfPlayerTouchesCustomElement(x, y);
   TestIfElementTouchesCustomElement(x, y);
 #endif
-
-#if 0
-  if (change->has_action)
-    ExecuteCustomElementAction(...);
-#endif
 }
 
 static boolean ChangeElementNow(int x, int y, int element, int page)
@@ -8300,7 +7958,7 @@ static boolean ChangeElementNow(int x, int y, int element, int page)
 
   if (ChangeEvent[x][y] == CE_DELAY)
   {
-    /* reset actual trigger element, trigger player and action element */
+    /* reset actual trigger element and player */
     change->actual_trigger_element = EL_EMPTY;
     change->actual_trigger_player = EL_PLAYER_1;
   }
@@ -8467,7 +8125,7 @@ static boolean ChangeElementNow(int x, int y, int element, int page)
          content_element = change->target_content[xx][yy];
          target_element = GET_TARGET_ELEMENT(content_element, change);
 
-         ChangeElementNowExt(change, ex, ey, target_element);
+         ChangeElementNowExt(ex, ey, target_element);
 
          something_has_changed = TRUE;
 
@@ -8485,7 +8143,7 @@ static boolean ChangeElementNow(int x, int y, int element, int page)
   {
     target_element = GET_TARGET_ELEMENT(change->target_element, change);
 
-    ChangeElementNowExt(change, x, y, target_element);
+    ChangeElementNowExt(x, y, target_element);
 
     PlayLevelSoundElementAction(x, y, element, ACTION_CHANGING);
   }
@@ -8528,12 +8186,8 @@ static void ChangeElement(int x, int y, int page)
 
   if (ChangeDelay[x][y] == 0)          /* initialize element change */
   {
-#if 1
-    ChangeDelay[x][y] = GET_CHANGE_DELAY(change) + 1;
-#else
     ChangeDelay[x][y] = (    change->delay_fixed  * change->delay_frames +
                         RND(change->delay_random * change->delay_frames)) + 1;
-#endif
 
     ResetGfxAnimation(x, y);
     ResetRandomAnimationValue(x, y);
@@ -8576,11 +8230,6 @@ static void ChangeElement(int x, int y, int page)
       return;
     }
 
-#if 0
-    if (change->has_action)
-      ExecuteCustomElementAction(element, page);
-#endif
-
     if (ChangeElementNow(x, y, element, page))
     {
       if (change->post_change_function)
@@ -8606,19 +8255,17 @@ static boolean CheckTriggeredElementChangeExt(int lx, int ly,
   {
     int element = EL_CUSTOM_START + i;
 
-    boolean change_found = FALSE;
     boolean change_element = FALSE;
     int page = 0;
 
-    if (!CAN_CHANGE_OR_HAS_ACTION(element) ||
-       !HAS_ANY_CHANGE_EVENT(element, trigger_event))
+    if (!CAN_CHANGE(element) || !HAS_ANY_CHANGE_EVENT(element, trigger_event))
       continue;
 
     for (j = 0; j < element_info[element].num_change_pages; j++)
     {
       struct ElementChangeInfo *change = &element_info[element].change_page[j];
 
-      if (change->can_change_or_has_action &&
+      if (change->can_change &&
          change->has_event[trigger_event] &&
          change->trigger_side & trigger_side &&
          change->trigger_player & trigger_player &&
@@ -8631,28 +8278,6 @@ static boolean CheckTriggeredElementChangeExt(int lx, int ly,
                 trigger_element-EL_CUSTOM_START+1, i+1, j, trigger_event);
 #endif
 
-#if 1
-       change->actual_trigger_element = trigger_element;
-       change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player);
-
-       if (change->can_change && !change_found)
-       {
-         change_found = TRUE;
-
-         for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
-         {
-           if (Feld[x][y] == element)
-           {
-             ChangeDelay[x][y] = 1;
-             ChangeEvent[x][y] = trigger_event;
-             ChangeElement(x, y, j);
-           }
-         }
-       }
-
-       if (change->has_action)
-         ExecuteCustomElementAction(element, j);
-#else
        change_element = TRUE;
        page = j;
 
@@ -8660,11 +8285,9 @@ static boolean CheckTriggeredElementChangeExt(int lx, int ly,
        change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player);
 
        break;
-#endif
       }
     }
 
-#if 0
     if (!change_element)
       continue;
 
@@ -8682,7 +8305,6 @@ static boolean CheckTriggeredElementChangeExt(int lx, int ly,
        ChangeElement(x, y, page);
       }
     }
-#endif
   }
 
   return TRUE;
@@ -8719,103 +8341,6 @@ static boolean CheckElementChangeExt(int x, int y,
   }
 #endif
 
-#if 1
-  if (trigger_page < 0)
-  {
-    boolean change_element = FALSE;
-    int i;
-
-    for (i = 0; i < element_info[element].num_change_pages; i++)
-    {
-      struct ElementChangeInfo *change = &element_info[element].change_page[i];
-
-      boolean check_trigger_element =
-       (trigger_event == CE_TOUCHING_X ||
-        trigger_event == CE_HITTING_X ||
-        trigger_event == CE_HIT_BY_X);
-
-      if (change->can_change &&
-         change->has_event[trigger_event] &&
-         change->trigger_side & trigger_side &&
-         change->trigger_player & trigger_player
-#if 1
-         &&
-         (!check_trigger_element ||
-          IS_EQUAL_OR_IN_GROUP(trigger_element, change->trigger_element))
-#endif
-         )
-      {
-       change_element = TRUE;
-       trigger_page = i;
-
-       change->actual_trigger_element = trigger_element;
-       change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player);
-
-       break;
-      }
-    }
-
-    if (!change_element)
-      return FALSE;
-  }
-  else
-  {
-    struct ElementInfo *ei = &element_info[element];
-    struct ElementChangeInfo *change = &ei->change_page[trigger_page];
-
-    change->actual_trigger_element = trigger_element;
-    change->actual_trigger_player = EL_PLAYER_1;       /* unused */
-  }
-
-#else
-
-  /* !!! this check misses pages with same event, but different side !!! */
-
-  if (trigger_page < 0)
-    trigger_page = element_info[element].event_page_nr[trigger_event];
-
-  if (!(element_info[element].change_page[trigger_page].trigger_side & trigger_side))
-    return FALSE;
-#endif
-
-  ChangeDelay[x][y] = 1;
-  ChangeEvent[x][y] = trigger_event;
-  ChangeElement(x, y, trigger_page);
-
-  return TRUE;
-}
-
-static boolean CheckElementChangeExtTEST(int x, int y,
-                                    int element,
-                                    int trigger_element,
-                                    int trigger_event,
-                                    int trigger_player,
-                                    int trigger_side,
-                                    int trigger_page)
-{
-  if (!CAN_CHANGE(element) || !HAS_ANY_CHANGE_EVENT(element, trigger_event))
-    return FALSE;
-
-  if (Feld[x][y] == EL_BLOCKED)
-  {
-    Blocked2Moving(x, y, &x, &y);
-    element = Feld[x][y];
-  }
-
-#if 1
-  if (Feld[x][y] != element)   /* check if element has already changed */
-  {
-#if 0
-    printf("::: %d ('%s') != %d ('%s') [%d]\n",
-          Feld[x][y], element_info[Feld[x][y]].token_name,
-          element, element_info[element].token_name,
-          trigger_event);
-#endif
-
-    return FALSE;
-  }
-#endif
-
 #if 1
   if (trigger_page < 0)
   {
@@ -8829,8 +8354,7 @@ static boolean CheckElementChangeExtTEST(int x, int y,
       if (change->can_change &&
          change->has_event[trigger_event] &&
          change->trigger_side & trigger_side &&
-         change->trigger_player & trigger_player &&
-         IS_EQUAL_OR_IN_GROUP(trigger_element, change->trigger_element))
+         change->trigger_player & trigger_player)
       {
        change_element = TRUE;
        trigger_page = i;
@@ -11187,18 +10711,6 @@ void TestIfElementTouchesCustomElement(int x, int y)
     else
       continue;                        /* center and border element do not touch */
 
-#if TEST_NEW_STUFF
-
-    /* check for change of center element (but change it only once) */
-    if (!change_center_element)
-      change_center_element =
-       CheckElementChangeBySide(x, y, center_element, border_element,
-                                CE_TOUCHING_X, border_side);
-
-    /* -> CheckElementChangeExtTEST */
-
-#else
-
     /* check for change of center element (but change it only once) */
     if (IS_CUSTOM_ELEMENT(center_element) &&
        HAS_ANY_CHANGE_EVENT(center_element, CE_TOUCHING_X) &&
@@ -11228,16 +10740,6 @@ void TestIfElementTouchesCustomElement(int x, int y)
       }
     }
 
-#endif
-
-#if TEST_NEW_STUFF
-
-    /* check for change of border element */
-    CheckElementChangeBySide(xx, yy, border_element, center_element,
-                            CE_TOUCHING_X, center_side);
-
-#else
-
     /* check for change of border element */
     if (IS_CUSTOM_ELEMENT(border_element) &&
        HAS_ANY_CHANGE_EVENT(border_element, CE_TOUCHING_X))
@@ -11267,13 +10769,8 @@ void TestIfElementTouchesCustomElement(int x, int y)
        }
       }
     }
-
-#endif
-
   }
 
-#if !TEST_NEW_STUFF
-
   if (change_center_element)
   {
 #if 0
@@ -11283,9 +10780,6 @@ void TestIfElementTouchesCustomElement(int x, int y)
     CheckElementChangeByPage(x, y, center_element, border_trigger_element,
                             CE_TOUCHING_X, center_element_change_page);
   }
-
-#endif
-
 }
 
 void TestIfElementHitsCustomElement(int x, int y, int direction)
@@ -11345,13 +10839,6 @@ void TestIfElementHitsCustomElement(int x, int y, int direction)
                               CE_HIT_BY_SOMETHING, opposite_direction);
 #endif
 
-#if TEST_NEW_STUFF
-
-      CheckElementChangeBySide(x, y, hitting_element, touched_element,
-                              CE_HITTING_X, touched_side);
-
-#else
-
       if (IS_CUSTOM_ELEMENT(hitting_element) &&
          HAS_ANY_CHANGE_EVENT(hitting_element, CE_HITTING_X))
       {
@@ -11378,14 +10865,6 @@ void TestIfElementHitsCustomElement(int x, int y, int direction)
        }
       }
 
-#endif
-
-#if TEST_NEW_STUFF
-
-      CheckElementChangeBySide(hitx, hity, touched_element,
-                              hitting_element, CE_HIT_BY_X, hitting_side);
-#else
-
       if (IS_CUSTOM_ELEMENT(touched_element) &&
          HAS_ANY_CHANGE_EVENT(touched_element, CE_HIT_BY_X))
       {
@@ -11411,8 +10890,6 @@ void TestIfElementHitsCustomElement(int x, int y, int direction)
        }
       }
 
-#endif
-
 #if USE_HIT_BY_SOMETHING_BUGFIX
       CheckElementChangeBySide(hitx, hity, touched_element, hitting_element,
                               CE_HIT_BY_SOMETHING, opposite_direction);
@@ -11480,12 +10957,6 @@ void TestIfElementSmashesCustomElement(int x, int y, int direction)
       CheckElementChangeBySide(hitx, hity, touched_element, hitting_element,
                               CE_SMASHED_BY_SOMETHING, opposite_direction);
 
-#if TEST_NEW_STUFF
-
-      CheckElementChangeBySide(x, y, hitting_element, touched_element,
-                              CE_OTHER_IS_SMASHING, touched_side);
-#else
-
       if (IS_CUSTOM_ELEMENT(hitting_element) &&
          HAS_ANY_CHANGE_EVENT(hitting_element, CE_OTHER_IS_SMASHING))
       {
@@ -11512,14 +10983,6 @@ void TestIfElementSmashesCustomElement(int x, int y, int direction)
        }
       }
 
-#endif
-
-#if TEST_NEW_STUFF
-
-      CheckElementChangeBySide(hitx, hity, touched_element, hitting_element,
-                              CE_OTHER_GETS_SMASHED, hitting_side);
-#else
-
       if (IS_CUSTOM_ELEMENT(touched_element) &&
          HAS_ANY_CHANGE_EVENT(touched_element, CE_OTHER_GETS_SMASHED))
       {
@@ -11544,9 +11007,6 @@ void TestIfElementSmashesCustomElement(int x, int y, int direction)
          }
        }
       }
-
-#endif
-
     }
   }
 }
@@ -12000,13 +11460,6 @@ int DigField(struct PlayerInfo *player,
 
   if (IS_TUBE(Back[jx][jy]) && game.engine_version >= VERSION_IDENT(2,2,0,0))
     old_element = Back[jx][jy];
-#if USE_BACK_WALKABLE_BUGFIX
-
-  /* in case of element dropped at player position, check background */
-  else if (Back[jx][jy] != EL_EMPTY &&
-          game.engine_version >= VERSION_IDENT(2,2,0,0))
-    old_element = Back[jx][jy];
-#endif
 
 #endif
 
@@ -12333,9 +11786,7 @@ int DigField(struct PlayerInfo *player,
        }
 
        if (element == EL_SPEED_PILL)
-       {
          player->move_delay_value = MOVE_DELAY_HIGH_SPEED;
-       }
        else if (element == EL_EXTRA_TIME && level.time > 0)
        {
          TimeLeft += 10;