X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=775bc0dc9dae4c4e3997e9143784a5ac893d7b05;hb=a16126b0981ba82ddcd5f7b0f763bc4ce6aa9bdc;hp=57fb652d2c3a58bc0b1cc7426bc251fba259127b;hpb=f806f2ad0dfa82c3abd3d027250a549ca22f4374;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 57fb652d..775bc0dc 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -586,6 +586,8 @@ void DrawPlayer(struct PlayerInfo *player)
 	graphic = GFX_MURPHY_GO_LEFT;
       else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
 	graphic = GFX_MURPHY_GO_RIGHT;
+      else
+	graphic = GFX_MURPHY_GO_LEFT;
 
       graphic += getGraphicAnimationPhase(3, 2, ANIM_OSCILLATE);
     }
@@ -645,7 +647,9 @@ void DrawPlayer(struct PlayerInfo *player)
       int element = Feld[next_jx][next_jy];
       int graphic = el2gfx(element);
 
-      if ((element == EL_FELSBROCKEN || element == EL_SP_ZONK) && sxx)
+      if ((element == EL_FELSBROCKEN ||
+	   element == EL_SP_ZONK ||
+	   element == EL_BD_ROCK) && sxx)
       {
 	int phase = (player->GfxPos / (TILEX / 4));
 
@@ -1170,12 +1174,16 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
   {
     graphic += phase4;
   }
-  else if ((element == EL_FELSBROCKEN || element == EL_SP_ZONK ||
+  else if ((element == EL_FELSBROCKEN ||
+	    element == EL_SP_ZONK ||
+	    element == EL_BD_ROCK ||
 	    IS_GEM(element)) && !cut_mode)
   {
     if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
     {
-      if (element == EL_FELSBROCKEN || element == EL_SP_ZONK)
+      if (element == EL_FELSBROCKEN ||
+	  element == EL_SP_ZONK ||
+	  element == EL_BD_ROCK)
       {
 	if (dir == MV_LEFT)
 	  graphic += (4 - phase4) % 4;
@@ -1188,8 +1196,10 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
 	graphic += phase2;
     }
   }
-  else if (element == EL_SIEB_LEER || element == EL_SIEB2_LEER ||
-	   element == EL_SIEB_VOLL || element == EL_SIEB2_VOLL)
+  else if (element == EL_MAGIC_WALL_EMPTY ||
+	   element == EL_MAGIC_WALL_BD_EMPTY ||
+	   element == EL_MAGIC_WALL_FULL ||
+	   element == EL_MAGIC_WALL_BD_FULL)
   {
     graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
   }
@@ -1417,13 +1427,13 @@ void DrawScreenField(int x, int y)
     boolean cut_mode = NO_CUTTING;
 
     if (Store[ux][uy] == EL_MORAST_LEER ||
-	Store[ux][uy] == EL_SIEB_LEER ||
-	Store[ux][uy] == EL_SIEB2_LEER ||
+	Store[ux][uy] == EL_MAGIC_WALL_EMPTY ||
+	Store[ux][uy] == EL_MAGIC_WALL_BD_EMPTY ||
 	Store[ux][uy] == EL_AMOEBE_NASS)
       cut_mode = CUT_ABOVE;
     else if (Store[ux][uy] == EL_MORAST_VOLL ||
-	     Store[ux][uy] == EL_SIEB_VOLL ||
-	     Store[ux][uy] == EL_SIEB2_VOLL)
+	     Store[ux][uy] == EL_MAGIC_WALL_FULL ||
+	     Store[ux][uy] == EL_MAGIC_WALL_BD_FULL)
       cut_mode = CUT_BELOW;
 
     if (cut_mode == CUT_ABOVE)
@@ -1453,8 +1463,8 @@ void DrawScreenField(int x, int y)
 		  MovDir[oldx][oldy] == MV_RIGHT);
 
     if (Store[oldx][oldy] == EL_MORAST_LEER ||
-	Store[oldx][oldy] == EL_SIEB_LEER ||
-	Store[oldx][oldy] == EL_SIEB2_LEER ||
+	Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY ||
+	Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY ||
 	Store[oldx][oldy] == EL_AMOEBE_NASS)
       cut_mode = CUT_ABOVE;
 
@@ -2447,10 +2457,10 @@ int el2gfx(int element)
     case EL_MORAST_VOLL:	return GFX_MORAST_VOLL;
     case EL_TROPFEN:		return GFX_TROPFEN;
     case EL_BOMBE:		return GFX_BOMBE;
-    case EL_SIEB_INAKTIV:	return GFX_SIEB_INAKTIV;
-    case EL_SIEB_LEER:		return GFX_SIEB_LEER;
-    case EL_SIEB_VOLL:		return GFX_SIEB_VOLL;
-    case EL_SIEB_TOT:		return GFX_SIEB_TOT;
+    case EL_MAGIC_WALL_OFF:	return GFX_MAGIC_WALL_OFF;
+    case EL_MAGIC_WALL_EMPTY:	return GFX_MAGIC_WALL_EMPTY;
+    case EL_MAGIC_WALL_FULL:	return GFX_MAGIC_WALL_FULL;
+    case EL_MAGIC_WALL_DEAD:	return GFX_MAGIC_WALL_DEAD;
     case EL_SALZSAEURE:		return GFX_SALZSAEURE;
     case EL_AMOEBE_TOT:		return GFX_AMOEBE_TOT;
     case EL_AMOEBE_NASS:	return GFX_AMOEBE_NASS;
@@ -2508,10 +2518,10 @@ int el2gfx(int element)
     case EL_ERZ_EDEL_ROT:	return GFX_ERZ_EDEL_ROT;
     case EL_ERZ_EDEL_LILA:	return GFX_ERZ_EDEL_LILA;
     case EL_MAMPFER2:		return GFX_MAMPFER2;
-    case EL_SIEB2_INAKTIV:	return GFX_SIEB2_INAKTIV;
-    case EL_SIEB2_LEER:		return GFX_SIEB2_LEER;
-    case EL_SIEB2_VOLL:		return GFX_SIEB2_VOLL;
-    case EL_SIEB2_TOT:		return GFX_SIEB2_TOT;
+    case EL_MAGIC_WALL_BD_OFF:	return GFX_MAGIC_WALL_BD_OFF;
+    case EL_MAGIC_WALL_BD_EMPTY:return GFX_MAGIC_WALL_BD_EMPTY;
+    case EL_MAGIC_WALL_BD_FULL:	return GFX_MAGIC_WALL_BD_FULL;
+    case EL_MAGIC_WALL_BD_DEAD:	return GFX_MAGIC_WALL_BD_DEAD;
     case EL_DYNABOMB_ACTIVE_1:	return GFX_DYNABOMB;
     case EL_DYNABOMB_ACTIVE_2:	return GFX_DYNABOMB;
     case EL_DYNABOMB_ACTIVE_3:	return GFX_DYNABOMB;
@@ -2650,8 +2660,13 @@ int el2gfx(int element)
     case EL_TUBE_RIGHT_UP:	return GFX_TUBE_RIGHT_UP;
     case EL_TUBE_RIGHT_DOWN:	return GFX_TUBE_RIGHT_DOWN;
     case EL_SPRING:		return GFX_SPRING;
+    case EL_SPRING_MOVING:	return GFX_SPRING;
     case EL_TRAP_INACTIVE:	return GFX_TRAP_INACTIVE;
     case EL_TRAP_ACTIVE:	return GFX_TRAP_ACTIVE;
+    case EL_BD_WALL:		return GFX_BD_WALL;
+    case EL_BD_ROCK:		return GFX_BD_ROCK;
+    case EL_DX_SUPABOMB:	return GFX_DX_SUPABOMB;
+    case EL_SP_MURPHY_CLONE:	return GFX_SP_MURPHY_CLONE;
 
     default:
     {