X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=e9ee41ae18e4208676b975b1b80f984b85b24c12;hp=fcc82f30f17919c995a146f877de3287c0607863;hb=6064f07f2fec89630017c1de73abb8768b1c692a;hpb=1a5c85211f0a5b74366d264260d464266afb208d

diff --git a/src/tools.c b/src/tools.c
index fcc82f30..e9ee41ae 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -360,10 +360,12 @@ static int getLevelFromScreenY_SP(int sy)
 
 static int getLevelFromScreenX_MM(int sx)
 {
+#if 0
   int level_xsize = level.native_mm_level->fieldx;
   int full_xsize = level_xsize * TILESIZE_VAR;
 
   sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
+#endif
 
   int px = sx - SX;
   int lx = px / TILESIZE_VAR;
@@ -373,10 +375,12 @@ static int getLevelFromScreenX_MM(int sx)
 
 static int getLevelFromScreenY_MM(int sy)
 {
+#if 0
   int level_ysize = level.native_mm_level->fieldy;
   int full_ysize = level_ysize * TILESIZE_VAR;
 
   sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
+#endif
 
   int py = sy - SY;
   int ly = py / TILESIZE_VAR;
@@ -412,6 +416,7 @@ void DumpTile(int x, int y)
 {
   int sx = SCREENX(x);
   int sy = SCREENY(y);
+  char *token_name;
 
   printf_line("-", 79);
   printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
@@ -425,8 +430,9 @@ void DumpTile(int x, int y)
     return;
   }
 
-  printf("  Feld:        %d\t['%s']\n", Feld[x][y],
-	 element_info[Feld[x][y]].token_name);
+  token_name = element_info[Feld[x][y]].token_name;
+
+  printf("  Feld:        %d\t['%s']\n", Feld[x][y], token_name);
   printf("  Back:        %s\n", print_if_not_empty(Back[x][y]));
   printf("  Store:       %s\n", print_if_not_empty(Store[x][y]));
   printf("  Store2:      %s\n", print_if_not_empty(Store2[x][y]));
@@ -2446,12 +2452,48 @@ void DrawLevelField(int x, int y)
   }
 }
 
+void DrawSizedWall_MM(int dst_x, int dst_y, int element, int tilesize,
+		      int (*el2img_function)(int))
+{
+  int element_base = map_mm_wall_element(element);
+  int element_bits = (IS_DF_WALL(element) ?
+		      element - EL_DF_WALL_START :
+		      element - EL_MM_WALL_START) & 0x000f;
+  int graphic = el2img_function(element_base);
+  int tilesize_draw = tilesize / 2;
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int i;
+
+  getSizedGraphicSource(graphic, 0, tilesize_draw, &src_bitmap, &src_x, &src_y);
+
+  for (i = 0; i < 4; i++)
+  {
+    int dst_draw_x = dst_x + (i % 2) * tilesize_draw;
+    int dst_draw_y = dst_y + (i / 2) * tilesize_draw;
+
+    if (element_bits & (1 << i))
+      BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize_draw, tilesize_draw,
+		 dst_draw_x, dst_draw_y);
+    else
+      ClearRectangle(drawto, dst_draw_x, dst_draw_y,
+		     tilesize_draw, tilesize_draw);
+  }
+}
+
 void DrawSizedElement(int x, int y, int element, int tilesize)
 {
-  int graphic;
+  if (IS_MM_WALL(element))
+  {
+    DrawSizedWall_MM(SX + x * tilesize, SY + y * tilesize,
+		     element, tilesize, el2edimg);
+  }
+  else
+  {
+    int graphic = el2edimg(element);
 
-  graphic = el2edimg(element);
-  DrawSizedGraphic(x, y, graphic, 0, tilesize);
+    DrawSizedGraphic(x, y, graphic, 0, tilesize);
+  }
 }
 
 void DrawMiniElement(int x, int y, int element)
@@ -2961,12 +3003,20 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
 
 void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
 {
-  Bitmap *src_bitmap;
-  int src_x, src_y;
-  int graphic = el2preimg(element);
+  if (IS_MM_WALL(element))
+  {
+    DrawSizedWall_MM(dst_x, dst_y, element, tilesize, el2preimg);
+  }
+  else
+  {
+    Bitmap *src_bitmap;
+    int src_x, src_y;
+    int graphic = el2preimg(element);
 
-  getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y);
-  BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y);
+    getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y);
+    BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize,
+	       dst_x, dst_y);
+  }
 }
 
 void DrawLevel(int draw_background_mask)
@@ -7230,12 +7280,85 @@ int map_action_SP_to_RND(int action_sp)
 
 int map_element_RND_to_MM(int element_rnd)
 {
-  return (element_rnd > 1000 ? element_rnd - 1000 : 0);
+  return (element_rnd >= EL_MM_START_1 &&
+	  element_rnd <= EL_MM_END_1 ?
+	  EL_MM_START_1_NATIVE + element_rnd - EL_MM_START_1 :
+
+	  element_rnd >= EL_MM_START_2 &&
+	  element_rnd <= EL_MM_END_2 ?
+	  EL_MM_START_2_NATIVE + element_rnd - EL_MM_START_2 :
+
+	  element_rnd >= EL_CHAR_START &&
+	  element_rnd <= EL_CHAR_END ?
+	  EL_MM_CHAR_START_NATIVE + element_rnd - EL_CHAR_START :
+
+	  element_rnd >= EL_MM_RUNTIME_START &&
+	  element_rnd <= EL_MM_RUNTIME_END ?
+	  EL_MM_RUNTIME_START_NATIVE + element_rnd - EL_MM_RUNTIME_START :
+
+	  element_rnd >= EL_MM_DUMMY_START &&
+	  element_rnd <= EL_MM_DUMMY_END ?
+	  EL_MM_DUMMY_START_NATIVE + element_rnd - EL_MM_DUMMY_START :
+
+	  EL_MM_EMPTY_NATIVE);
 }
 
 int map_element_MM_to_RND(int element_mm)
 {
-  return 1000 + element_mm;
+  return (element_mm == EL_MM_EMPTY_NATIVE ||
+	  element_mm == EL_DF_EMPTY_NATIVE ?
+	  EL_EMPTY :
+
+	  element_mm >= EL_MM_START_1_NATIVE &&
+	  element_mm <= EL_MM_END_1_NATIVE ?
+	  EL_MM_START_1 + element_mm - EL_MM_START_1_NATIVE :
+
+	  element_mm >= EL_MM_START_2_NATIVE &&
+	  element_mm <= EL_MM_END_2_NATIVE ?
+	  EL_MM_START_2 + element_mm - EL_MM_START_2_NATIVE :
+
+	  element_mm >= EL_MM_CHAR_START_NATIVE &&
+	  element_mm <= EL_MM_CHAR_END_NATIVE ?
+	  EL_CHAR_START + element_mm - EL_MM_CHAR_START_NATIVE :
+
+	  element_mm >= EL_MM_RUNTIME_START_NATIVE &&
+	  element_mm <= EL_MM_RUNTIME_END_NATIVE ?
+	  EL_MM_RUNTIME_START + element_mm - EL_MM_RUNTIME_START_NATIVE :
+
+	  element_mm >= EL_MM_DUMMY_START_NATIVE &&
+	  element_mm <= EL_MM_DUMMY_END_NATIVE ?
+	  EL_MM_DUMMY_START + element_mm - EL_MM_DUMMY_START_NATIVE :
+
+	  EL_EMPTY);
+}
+
+int map_mm_wall_element(int element)
+{
+  return (element >= EL_MM_STEEL_WALL_START &&
+	  element <= EL_MM_STEEL_WALL_END ?
+	  EL_MM_STEEL_WALL :
+
+	  element >= EL_MM_WOODEN_WALL_START &&
+	  element <= EL_MM_WOODEN_WALL_END ?
+	  EL_MM_WOODEN_WALL :
+
+	  element >= EL_MM_ICE_WALL_START &&
+	  element <= EL_MM_ICE_WALL_END ?
+	  EL_MM_ICE_WALL :
+
+	  element >= EL_MM_AMOEBA_WALL_START &&
+	  element <= EL_MM_AMOEBA_WALL_END ?
+	  EL_MM_AMOEBA_WALL :
+
+	  element >= EL_DF_STEEL_WALL_START &&
+	  element <= EL_DF_STEEL_WALL_END ?
+	  EL_DF_STEEL_WALL :
+
+	  element >= EL_DF_WOODEN_WALL_START &&
+	  element <= EL_DF_WOODEN_WALL_END ?
+	  EL_DF_WOODEN_WALL :
+
+	  element);
 }
 
 int get_next_element(int element)
@@ -7258,6 +7381,11 @@ int get_next_element(int element)
   }
 }
 
+int el2img_mm(int element_mm)
+{
+  return el2img(map_element_MM_to_RND(element_mm));
+}
+
 int el_act_dir2img(int element, int action, int direction)
 {
   element = GFX_ELEMENT(element);