X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=f2f3cdd03859b746a9b97f774d6854db2c8d7a0c;hb=4c2027809249e8cfb5d81ef0ab5835f40c3a3835;hp=31a555d67a2177b7fdc186f9dbe3989ed44f5829;hpb=d5224fde97c235c903f631a4eccb9904c2ddf9c3;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 31a555d6..f2f3cdd0 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -483,7 +483,13 @@ void DrawLevelGraphicAnimation(int x, int y, int graphic)
 
 void DrawLevelElementAnimation(int x, int y, int element)
 {
+#if 1
+  int graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+
+  DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+#else
   DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
+#endif
 }
 
 inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
@@ -925,11 +931,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
 {
   Bitmap *src_bitmap;
   GC drawing_gc;
-  int src_x;
-  int src_y;
-  int offset_x;
-  int offset_y;
-
+  int src_x, src_y;
   int width = TILEX, height = TILEY;
   int cx = 0, cy = 0;
   int dest_x, dest_y;
@@ -1004,16 +1006,20 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
       MarkTileDirty(x, y + SIGN(dy));
   }
 
+#if 1
+  getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+#else
   src_bitmap = graphic_info[graphic].bitmap;
   src_x = graphic_info[graphic].src_x;
   src_y = graphic_info[graphic].src_y;
   offset_x = graphic_info[graphic].offset_x;
   offset_y = graphic_info[graphic].offset_y;
 
-  drawing_gc = src_bitmap->stored_clip_gc;
-
   src_x += frame * offset_x;
   src_y += frame * offset_y;
+#endif
+
+  drawing_gc = src_bitmap->stored_clip_gc;
 
   src_x += cx;
   src_y += cy;
@@ -1199,7 +1205,8 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
 
       element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : EL_STEELWALL);
 
-      if (CAN_BE_CRUMBLED(element))	/* neighbour is of same type */
+      /* check if neighbour field is of same type */
+      if (CAN_BE_CRUMBLED(element))
 	continue;
 
       if (i == 1 || i == 2)
@@ -1455,6 +1462,7 @@ void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
   int src_x = mini_startx + graphic_info[graphic].src_x / 8;
   int src_y = mini_starty + graphic_info[graphic].src_y / 8;
 
+#if 0
   if (src_x + MICRO_TILEX > src_bitmap->width ||
       src_y + MICRO_TILEY > src_bitmap->height)
   {
@@ -1465,6 +1473,7 @@ void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
     src_x += (TILEX / 2 - MICRO_TILEX / 2);
     src_y += (TILEY / 2 - MICRO_TILEY / 2);
   }
+#endif
 
   *bitmap = src_bitmap;
   *x = src_x;
@@ -2390,6 +2399,7 @@ int get_next_element(int element)
 
 int el_act_dir2img(int element, int action, int direction)
 {
+  element = GFX_ELEMENT(element);
   direction = MV_DIR_BIT(direction);
 
   return element_info[element].direction_graphic[action][direction];
@@ -2397,25 +2407,35 @@ int el_act_dir2img(int element, int action, int direction)
 
 int el_act2img(int element, int action)
 {
+  element = GFX_ELEMENT(element);
+
   return element_info[element].graphic[action];
 }
 
 int el_dir2img(int element, int direction)
 {
+  element = GFX_ELEMENT(element);
+
   return el_act_dir2img(element, ACTION_DEFAULT, direction);
 }
 
 int el2img(int element)
 {
+  element = GFX_ELEMENT(element);
+
   return element_info[element].graphic[ACTION_DEFAULT];
 }
 
 int el2edimg(int element)
 {
+  element = GFX_ELEMENT(element);
+
   return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
 }
 
 int el2preimg(int element)
 {
+  element = GFX_ELEMENT(element);
+
   return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
 }