X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=e6f0753e4914aecfa85760c32b675388f93a0944;hb=3140ab2a0de5599122e88579f48603146595e1c7;hp=7e24e5016f0ac0dc049e8e2154ae62b1bdddef33;hpb=c5ee7e4524f10322894b2547337e4c973a80a552;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 7e24e501..e6f0753e 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -435,29 +435,9 @@ void SetBorderElement()
   }
 }
 
-static int getGraphicAnimationPhase(int frames, int delay, int mode)
-{
-  int phase;
-
-  if (mode & ANIM_PINGPONG)
-  {
-    int max_anim_frames = 2 * frames - 2;
-
-    phase = (FrameCounter % (delay * max_anim_frames)) / delay;
-    phase = (phase < frames ? phase : max_anim_frames - phase);
-  }
-  else
-    phase = (FrameCounter % (delay * frames)) / delay;
-
-  if (mode & ANIM_REVERSE)
-    phase = -phase;
-
-  return phase;
-}
-
 void SetRandomAnimationValue(int x, int y)
 {
-  anim.simple_random_value = GfxRandom[x][y];
+  anim.random_frame = GfxRandom[x][y];
 }
 
 inline int getGraphicAnimationFrame(int graphic, int sync_frame)
@@ -484,60 +464,55 @@ inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
     DrawGraphicExt(dst_bitmap, x, y, graphic, frame);
 }
 
-inline boolean checkDrawGraphicAnimation(int x, int y, int graphic)
-{
-  int lx = LEVELX(x), ly = LEVELY(y);
-
-  return (IN_SCR_FIELD(x, y) &&
-	  GfxFrame[lx][ly] % graphic_info[graphic].anim_delay == 0);
-}
-
-inline boolean checkDrawLevelGraphicAnimation(int x, int y, int graphic)
-{
-  return (IN_SCR_FIELD(SCREENX(x), SCREENY(y)) &&
-	  GfxFrame[x][y] % graphic_info[graphic].anim_delay == 0);
-}
-
-inline boolean DrawGraphicAnimation(int x, int y, int graphic)
+inline void DrawGraphicAnimation(int x, int y, int graphic)
 {
   int lx = LEVELX(x), ly = LEVELY(y);
 
-#if 0
-  if (!checkDrawGraphicAnimation(x, y, graphic))
-    return FALSE;
-#else
   if (!IN_SCR_FIELD(x, y))
-    return FALSE;
-#endif
+    return;
 
   DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
 			  graphic, GfxFrame[lx][ly], NO_MASKING);
   MarkTileDirty(x, y);
-
-  return TRUE;
 }
 
-boolean DrawLevelGraphicAnimation(int x, int y, int graphic)
+void DrawLevelGraphicAnimation(int x, int y, int graphic)
 {
-  return DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+  DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
 }
 
-boolean DrawLevelElementAnimation(int x, int y, int element)
+void DrawLevelElementAnimation(int x, int y, int element)
 {
-  return DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
+  DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
 }
 
-inline void ContinueLevelGraphicAnimation(int x, int y, int graphic)
+inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
 {
-  if (GfxFrame[x][y] % graphic_info[graphic].anim_delay != 0)
+  int sx = SCREENX(x), sy = SCREENY(y);
+
+  if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy))
     return;
 
-  DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+  if (!IS_NEW_FRAME(GfxFrame[x][y], graphic))
+    return;
+
+  DrawGraphicAnimation(sx, sy, graphic);
 }
 
-void ContinueLevelElementAnimation(int x, int y, int element)
+void DrawLevelElementAnimationIfNeeded(int x, int y, int element)
 {
-  ContinueLevelGraphicAnimation(x, y, el2img(element));
+  int sx = SCREENX(x), sy = SCREENY(y);
+  int graphic;
+
+  if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy))
+    return;
+
+  graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+
+  if (!IS_NEW_FRAME(GfxFrame[x][y], graphic))
+    return;
+
+  DrawGraphicAnimation(sx, sy, graphic);
 }
 
 void DrawAllPlayers()
@@ -765,7 +740,7 @@ void DrawPlayer(struct PlayerInfo *player)
 
       if ((sxx || syy) && IS_PUSHABLE(element))
       {
-	graphic = el_dir_act2img(element, player->MovDir, ACTION_MOVING);
+	graphic = el_act_dir2img(element, ACTION_MOVING, player->MovDir);
 #if 1
 	frame = getGraphicAnimationFrame(graphic, player->GfxPos);
 
@@ -1132,88 +1107,39 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
   MarkTileDirty(x,y);
 }
 
-void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
+void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy, int graphic,
 				int frame, int cut_mode)
 {
   DrawGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING);
 }
 
-inline static int getFramePosition(int x, int y)
-{
-  int frame_pos = -1;		/* default: global synchronization */
-#if 0
-  int element = Feld[x][y];
-
-  if (element == EL_QUICKSAND_FULL ||
-      element == EL_MAGIC_WALL_FULL ||
-      element == EL_BD_MAGIC_WALL_FULL)
-    frame_pos = -1;
-  else if (IS_MOVING(x, y) || CAN_MOVE(element) || CAN_FALL(element))
-    frame_pos = ABS(MovPos[x][y]) / (TILEX / 8);
-#else
-
-  frame_pos = ABS(MovPos[x][y]) / (TILEX / 8);
-
-  frame_pos = GfxFrame[x][y];
-
-#endif
-
-  return frame_pos;
-}
-
-inline static int getGfxAction(int x, int y)
-{
-  int gfx_action = ACTION_DEFAULT;
-
-#if 0
-  if (GfxAction[x][y] != ACTION_DEFAULT)
-    gfx_action = GfxAction[x][y];
-  else if (IS_MOVING(x, y))
-    gfx_action = ACTION_MOVING;
-#else
-  gfx_action = GfxAction[x][y];
-#endif
-
-#if DEBUG
-  if (gfx_action < 0)
-    printf("getGfxAction: THIS SHOULD NEVER HAPPEN: GfxAction[%d][%d] == %d\n",
-	   x, y, gfx_action);
-#endif
-
-  return gfx_action;
-}
-
 void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
 			  int cut_mode, int mask_mode)
 {
-  int ux = LEVELX(x), uy = LEVELY(y);
+  int lx = LEVELX(x), ly = LEVELY(y);
   int graphic;
   int frame;
 
-  if (IN_LEV_FIELD(ux, uy))
+  if (IN_LEV_FIELD(lx, ly))
   {
-    int move_dir = MovDir[ux][uy];
-    int move_pos = getFramePosition(ux, uy);
-    int gfx_action = getGfxAction(ux, uy);
-
-    SetRandomAnimationValue(ux, uy);
+    SetRandomAnimationValue(lx, ly);
 
-    graphic = el_dir_act2img(element, move_dir, gfx_action);
-    frame = getGraphicAnimationFrame(graphic, move_pos);
+    graphic = el_act_dir2img(element, GfxAction[lx][ly], MovDir[lx][ly]);
+    frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]);
   }
-  else
+  else	/* border element */
   {
     graphic = el2img(element);
-    frame = getGraphicAnimationFrame(graphic, 0);
+    frame = getGraphicAnimationFrame(graphic, -1);
   }
 
   if (element == EL_WALL_GROWING)
   {
     boolean left_stopped = FALSE, right_stopped = FALSE;
 
-    if (!IN_LEV_FIELD(ux - 1, uy) || IS_MAUER(Feld[ux - 1][uy]))
+    if (!IN_LEV_FIELD(lx - 1, ly) || IS_MAUER(Feld[lx - 1][ly]))
       left_stopped = TRUE;
-    if (!IN_LEV_FIELD(ux + 1, uy) || IS_MAUER(Feld[ux + 1][uy]))
+    if (!IN_LEV_FIELD(lx + 1, ly) || IS_MAUER(Feld[lx + 1][ly]))
       right_stopped = TRUE;
 
     if (left_stopped && right_stopped)
@@ -1229,6 +1155,7 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
       frame = graphic_info[graphic].anim_frames - 1;
     }
   }
+#if 0
   else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
   {
     graphic = (element == EL_BD_AMOEBA ? IMG_BD_AMOEBA_PART1 :
@@ -1239,6 +1166,16 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
 
     graphic += (x + 2 * y + 4) % 4;
   }
+#endif
+
+#if 0
+  if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
+  {
+    if (Feld[lx][ly] == EL_AMOEBA_DRIPPING)
+      printf("---> %d -> %d / %d [%d]\n",
+	     element, graphic, frame, GfxRandom[lx][ly]);
+  }
+#endif
 
   if (dx || dy)
     DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
@@ -1295,7 +1232,7 @@ void DrawCrumbledSand(int x, int y)
   Bitmap *src_bitmap;
   int src_x, src_y;
   int i, width, height, cx,cy;
-  int ux = LEVELX(x), uy = LEVELY(y);
+  int lx = LEVELX(x), ly = LEVELY(y);
   int element, graphic;
   int snip = 4;
   static int xy[4][2] =
@@ -1306,10 +1243,10 @@ void DrawCrumbledSand(int x, int y)
     { 0, +1 }
   };
 
-  if (!IN_LEV_FIELD(ux, uy))
+  if (!IN_LEV_FIELD(lx, ly))
     return;
 
-  element = Feld[ux][uy];
+  element = Feld[lx][ly];
 
   if (element == EL_SAND ||
       element == EL_LANDMINE ||
@@ -1327,14 +1264,14 @@ void DrawCrumbledSand(int x, int y)
 
     for(i=0; i<4; i++)
     {
-      int uxx, uyy;
+      int lxx, lyy;
 
-      uxx = ux + xy[i][0];
-      uyy = uy + xy[i][1];
-      if (!IN_LEV_FIELD(uxx, uyy))
+      lxx = lx + xy[i][0];
+      lyy = ly + xy[i][1];
+      if (!IN_LEV_FIELD(lxx, lyy))
 	element = EL_STEELWALL;
       else
-	element = Feld[uxx][uyy];
+	element = Feld[lxx][lyy];
 
       if (element == EL_SAND ||
 	  element == EL_LANDMINE ||
@@ -1373,18 +1310,18 @@ void DrawCrumbledSand(int x, int y)
 
     for(i=0; i<4; i++)
     {
-      int xx, yy, uxx, uyy;
+      int xx, yy, lxx, lyy;
 
       xx = x + xy[i][0];
       yy = y + xy[i][1];
-      uxx = ux + xy[i][0];
-      uyy = uy + xy[i][1];
-
-      if (!IN_LEV_FIELD(uxx, uyy) ||
-	  (Feld[uxx][uyy] != EL_SAND &&
-	   Feld[uxx][uyy] != EL_LANDMINE &&
-	   Feld[uxx][uyy] != EL_TRAP &&
-	   Feld[uxx][uyy] != EL_TRAP_ACTIVE) ||
+      lxx = lx + xy[i][0];
+      lyy = ly + xy[i][1];
+
+      if (!IN_LEV_FIELD(lxx, lyy) ||
+	  (Feld[lxx][lyy] != EL_SAND &&
+	   Feld[lxx][lyy] != EL_LANDMINE &&
+	   Feld[lxx][lyy] != EL_TRAP &&
+	   Feld[lxx][lyy] != EL_TRAP_ACTIVE) ||
 	  !IN_SCR_FIELD(xx, yy))
 	continue;
 
@@ -1411,6 +1348,29 @@ void DrawCrumbledSand(int x, int y)
   }
 }
 
+static int getBorderElement(int x, int y)
+{
+  int border[7][2] =
+  {
+    { EL_STEELWALL_TOPLEFT,		EL_INVISIBLE_STEELWALL_TOPLEFT     },
+    { EL_STEELWALL_TOPRIGHT,		EL_INVISIBLE_STEELWALL_TOPRIGHT    },
+    { EL_STEELWALL_BOTTOMLEFT,		EL_INVISIBLE_STEELWALL_BOTTOMLEFT  },
+    { EL_STEELWALL_BOTTOMRIGHT,		EL_INVISIBLE_STEELWALL_BOTTOMRIGHT },
+    { EL_STEELWALL_VERTICAL,		EL_INVISIBLE_STEELWALL_VERTICAL    },
+    { EL_STEELWALL_HORIZONTAL,		EL_INVISIBLE_STEELWALL_HORIZONTAL  },
+    { EL_STEELWALL,			EL_INVISIBLE_STEELWALL		   }
+  };
+  int steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
+  int steel_position = (x == -1 && y == -1			? 0 :
+			x == lev_fieldx && y == -1		? 1 :
+			x == -1 && y == lev_fieldy		? 2 :
+			x == lev_fieldx && y == lev_fieldy	? 3 :
+			x == -1 || x == lev_fieldx		? 4 :
+			y == -1 || y == lev_fieldy		? 5 : 6);
+
+  return border[steel_position][steel_type];
+}
+
 void DrawScreenElement(int x, int y, int element)
 {
   DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
@@ -1425,26 +1385,26 @@ void DrawLevelElement(int x, int y, int element)
 
 void DrawScreenField(int x, int y)
 {
-  int ux = LEVELX(x), uy = LEVELY(y);
+  int lx = LEVELX(x), ly = LEVELY(y);
   int element, content;
 
-  if (!IN_LEV_FIELD(ux, uy))
+  if (!IN_LEV_FIELD(lx, ly))
   {
-    if (ux < -1 || ux > lev_fieldx || uy < -1 || uy > lev_fieldy)
+    if (lx < -1 || lx > lev_fieldx || ly < -1 || ly > lev_fieldy)
       element = EL_EMPTY;
     else
-      element = BorderElement;
+      element = getBorderElement(lx, ly);
 
     DrawScreenElement(x, y, element);
     return;
   }
 
-  element = Feld[ux][uy];
-  content = Store[ux][uy];
+  element = Feld[lx][ly];
+  content = Store[lx][ly];
 
-  if (IS_MOVING(ux, uy))
+  if (IS_MOVING(lx, ly))
   {
-    int horiz_move = (MovDir[ux][uy] == MV_LEFT || MovDir[ux][uy] == MV_RIGHT);
+    int horiz_move = (MovDir[lx][ly] == MV_LEFT || MovDir[lx][ly] == MV_RIGHT);
     boolean cut_mode = NO_CUTTING;
 
     if (element == EL_QUICKSAND_EMPTYING ||
@@ -1463,16 +1423,16 @@ void DrawScreenField(int x, int y)
       DrawScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
-      DrawScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
+      DrawScreenElementShifted(x, y, MovPos[lx][ly], 0, element, NO_CUTTING);
     else if (cut_mode == NO_CUTTING)
-      DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
+      DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], element, cut_mode);
     else
-      DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
+      DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode);
 
     if (content == EL_ACID)
-      DrawLevelElementThruMask(ux, uy + 1, EL_ACID);
+      DrawLevelElementThruMask(lx, ly + 1, EL_ACID);
   }
-  else if (IS_BLOCKED(ux, uy))
+  else if (IS_BLOCKED(lx, ly))
   {
     int oldx, oldy;
     int sx, sy;
@@ -1480,7 +1440,7 @@ void DrawScreenField(int x, int y)
     boolean cut_mode = NO_CUTTING;
     int element_old, content_old;
 
-    Blocked2Moving(ux, uy, &oldx, &oldy);
+    Blocked2Moving(lx, ly, &oldx, &oldy);
     sx = SCREENX(oldx);
     sy = SCREENY(oldy);
     horiz_move = (MovDir[oldx][oldy] == MV_LEFT ||
@@ -1539,7 +1499,7 @@ void DrawMiniElement(int x, int y, int element)
 {
   int graphic;
 
-  graphic = el2img(element);
+  graphic = el2edimg(element);
   DrawMiniGraphic(x, y, graphic);
 }
 
@@ -1552,29 +1512,7 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
   else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
     DrawMiniElement(sx, sy, Feld[x][y]);
   else
-  {
-    int steel_type, steel_position;
-    int border[6][2] =
-    {
-      { IMG_STEELWALL_TOPLEFT,		IMG_INVISIBLE_STEELWALL_TOPLEFT     },
-      { IMG_STEELWALL_TOPRIGHT,		IMG_INVISIBLE_STEELWALL_TOPRIGHT    },
-      { IMG_STEELWALL_BOTTOMLEFT,	IMG_INVISIBLE_STEELWALL_BOTTOMLEFT  },
-      { IMG_STEELWALL_BOTTOMRIGHT,	IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT },
-      { IMG_STEELWALL_VERTICAL,		IMG_INVISIBLE_STEELWALL_VERTICAL    },
-      { IMG_STEELWALL_HORIZONTAL,	IMG_INVISIBLE_STEELWALL_HORIZONTAL  }
-    };
-
-    steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
-    steel_position = (x == -1 && y == -1			? 0 :
-		      x == lev_fieldx && y == -1		? 1 :
-		      x == -1 && y == lev_fieldy		? 2 :
-		      x == lev_fieldx && y == lev_fieldy	? 3 :
-		      x == -1 || x == lev_fieldx		? 4 :
-		      y == -1 || y == lev_fieldy		? 5 : -1);
-
-    if (steel_position != -1)
-      DrawMiniGraphic(sx, sy, border[steel_position][steel_type]);
-  }
+    DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y)));
 }
 
 void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
@@ -1605,7 +1543,7 @@ void DrawMicroElement(int xpos, int ypos, int element)
 {
   Bitmap *src_bitmap;
   int src_x, src_y;
-  int graphic = el2img(element);
+  int graphic = el2preimg(element);
 
   getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
   BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY,
@@ -1663,7 +1601,7 @@ static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y)
       else if (lx >= -1 && lx < lev_fieldx+1 && ly >= -1 && ly < lev_fieldy+1
 	       && BorderElement != EL_EMPTY)
 	DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
-			 BorderElement);
+			 getBorderElement(lx, ly));
     }
   }
 
@@ -2503,45 +2441,34 @@ int get_next_element(int element)
   }
 }
 
-int el2img(int element)
+int el_act_dir2img(int element, int action, int direction)
 {
-  int graphic = element_info[element].graphic[ACTION_DEFAULT];
+  direction = MV_DIR_BIT(direction);
 
-#if DEBUG
-  if (graphic < 0)
-    Error(ERR_WARN, "element %d -> graphic %d -- probably crashing now...",
-	  element, graphic);
-#endif
+  return element_info[element].direction_graphic[action][direction];
+}
 
-  return graphic;
+int el_act2img(int element, int action)
+{
+  return element_info[element].graphic[action];
 }
 
 int el_dir2img(int element, int direction)
 {
-  return el_dir_act2img(element, direction, ACTION_DEFAULT);
+  return el_act_dir2img(element, ACTION_DEFAULT, direction);
 }
 
-int el_dir_act2img(int element, int direction, int action)
+int el2img(int element)
 {
-#if DEBUG
-  if (element < 0)
-  {    
-    printf("el_dir_act2img: THIS SHOULD NEVER HAPPEN: element == %d\n",
-	   element);
-
-    return IMG_EMPTY;
-  }
-
-  if (action < 0)
-  {    
-    printf("el_dir_act2img: THIS SHOULD NEVER HAPPEN: action == %d\n",
-	   action);
-
-    return IMG_EMPTY;
-  }
-#endif
+  return element_info[element].graphic[ACTION_DEFAULT];
+}
 
-  direction = MV_DIR_BIT(direction);
+int el2edimg(int element)
+{
+  return element_info[element].editor_graphic;
+}
 
-  return element_info[element].direction_graphic[action][direction];
+int el2preimg(int element)
+{
+  return element_info[element].preview_graphic;
 }