moved code for handling wall side of slope for MM engine

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index dafcbbd47c8441f42cc99a351c062e821d6e8912..a6287f2e0b202b60cc889c4120c326b597bb61fb 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5405,17 +5405,9 @@ void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
 
 void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y)
 {
-  int oldx = x, oldy = y;
   int direction = MovDir[x][y];
-
-  if (direction == MV_LEFT)
-    oldx++;
-  else if (direction == MV_RIGHT)
-    oldx--;
-  else if (direction == MV_UP)
-    oldy++;
-  else if (direction == MV_DOWN)
-    oldy--;
+  int oldx = x + (direction & MV_LEFT ? +1 : direction & MV_RIGHT ? -1 : 0);
+  int oldy = y + (direction & MV_UP   ? +1 : direction & MV_DOWN  ? -1 : 0);
 
   *comes_from_x = oldx;
   *comes_from_y = oldy;
@@ -5846,6 +5838,8 @@ static void Explode(int ex, int ey, int phase, int mode)
   if (phase == EX_PHASE_START)         // initialize 'Store[][]' field
   {
     int center_element = Tile[ex][ey];
+    int ce_value = CustomValue[ex][ey];
+    int ce_score = element_info[center_element].collect_score;
     int artwork_element, explosion_element;    // set these values later
 
     // remove things displayed in background while burning dynamite
@@ -5984,6 +5978,14 @@ static void Explode(int ex, int ey, int phase, int mode)
       else
        Store[x][y] = EL_EMPTY;
 
+      if (IS_CUSTOM_ELEMENT(center_element))
+       Store[x][y] = (Store[x][y] == EL_CURRENT_CE_VALUE ? ce_value :
+                      Store[x][y] == EL_CURRENT_CE_SCORE ? ce_score :
+                      Store[x][y] >= EL_PREV_CE_8 &&
+                      Store[x][y] <= EL_NEXT_CE_8 ?
+                      RESOLVED_REFERENCE_ELEMENT(center_element, Store[x][y]) :
+                      Store[x][y]);
+
       if (x != ex || y != ey || mode == EX_TYPE_BORDER ||
          center_element == EL_AMOEBA_TO_DIAMOND)
        Store2[x][y] = element;
@@ -15239,10 +15241,12 @@ static void StopLevelSoundActionIfLoop(int x, int y, int action)
 
 static int getLevelMusicNr(void)
 {
+  int level_pos = level_nr - leveldir_current->first_level;
+
   if (levelset.music[level_nr] != MUS_UNDEFINED)
     return levelset.music[level_nr];           // from config file
   else
-    return MAP_NOCONF_MUSIC(level_nr);         // from music dir
+    return MAP_NOCONF_MUSIC(level_pos);                // from music dir
 }
 
 static void FadeLevelSounds(void)