From: Holger Schemel <info@artsoft.org>
Date: Sat, 23 Jan 1999 02:57:55 +0000 (+0100)
Subject: rnd-19990123-2
X-Git-Tag: 1.3.0^2~19
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=23c658debac513b4ab7e2d1c0f5a8cc011f6927b;p=rocksndiamonds.git

rnd-19990123-2
---

diff --git a/src/editor.c b/src/editor.c
index 65c9f33f..15eab774 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -74,7 +74,7 @@
 #define ED_CTRL2_BUTTON_XSIZE		30
 #define ED_CTRL2_BUTTON_YSIZE		20
 #define ED_CTRL2_BUTTONS_XPOS		5
-#define ED_CTRL2_BUTTONS_YPOS		100
+#define ED_CTRL2_BUTTONS_YPOS		99
 #define ED_NUM_CTRL1_BUTTONS   (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT)
 #define ED_NUM_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
 #define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
@@ -661,10 +661,10 @@ int editor_element[] =
   EL_MAUER_Y,
   EL_MAUER_XY,
 
+  EL_INVISIBLE_STEEL,
+  EL_UNSICHTBAR,
   EL_SPEED_PILL,
   EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
 
   EL_CHAR_A + ('S' - 'A'),
   EL_CHAR_A + ('O' - 'A'),
diff --git a/src/main.h b/src/main.h
index 121b1081..e0435d09 100644
--- a/src/main.h
+++ b/src/main.h
@@ -532,9 +532,9 @@ extern int		num_bg_loops;
 #define MICRO_GFX_PER_LINE	128
 #define HEROES_PER_LINE		16
 #define MINI_MORE_STARTX	0
-#define MINI_MORE_STARTY	160
+#define MINI_MORE_STARTY	224
 #define MICRO_MORE_STARTX	0
-#define MICRO_MORE_STARTY	240
+#define MICRO_MORE_STARTY	336
 #define MORE_PER_LINE		16
 #define MINI_MORE_PER_LINE	16
 #define MICRO_MORE_PER_LINE	16
@@ -832,7 +832,11 @@ extern int		num_bg_loops;
 #define GFX_BADEWANNE1		16
 #define GFX_SALZSAEURE		17
 #define GFX_BADEWANNE2		18
+
+/*
 #define GFX_UNSICHTBAR		19
+*/
+
 #define GFX_SCHLUESSEL1		20
 #define GFX_SCHLUESSEL2		21
 #define GFX_SCHLUESSEL3		22
@@ -971,8 +975,15 @@ extern int		num_bg_loops;
 #define GFX_FIREFLY_L		206
 #define GFX_FIREFLY_U		207
 
-#define GFX_INVISIBLE_STEEL	GFX_UNSICHTBAR
+/* only available as size MINI_TILE */
+#define GFX_STEEL_UPPER_LEFT	208
+#define GFX_STEEL_UPPER_RIGHT	209
+#define GFX_STEEL_LOWER_LEFT	210
+#define GFX_STEEL_LOWER_RIGHT	211
+#define GFX_STEEL_HORIZONTAL	212
+#define GFX_STEEL_VERTICAL	213
 
+/* elements with graphics borrowed from other elements */
 #define GFX_SCHLUESSEL		GFX_SCHLUESSEL1
 #define GFX_SPIELFIGUR		GFX_SPIELER1
 
@@ -1072,6 +1083,9 @@ extern int		num_bg_loops;
 #define GFX_SP_CHIP_UPPER	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 6)
 #define GFX_SP_CHIP_LOWER	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 7)
 
+#define GFX_INVISIBLE_STEEL	(GFX_START_ROCKSMORE +  5 * MORE_PER_LINE + 3)
+#define GFX_UNSICHTBAR		(GFX_START_ROCKSMORE +  5 * MORE_PER_LINE + 7)
+
 #define GFX_SP_BUG_WARNING	(GFX_START_ROCKSMORE +  2 * MORE_PER_LINE +15)
 #define GFX_SP_EXPLODE_EMPTY	(GFX_START_ROCKSMORE +  3 * MORE_PER_LINE + 8)
 #define GFX_SP_EXPLODE_INFOTRON	(GFX_START_ROCKSMORE +  4 * MORE_PER_LINE + 8)
diff --git a/src/tools.c b/src/tools.c
index 8006573e..60fa3fe9 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1343,10 +1343,20 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
 
   if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
     DrawMiniElement(sx, sy, EL_LEERRAUM);
-  else if (x == -1 || x == lev_fieldx || y == -1 || y == lev_fieldy)
-    DrawMiniElement(sx, sy, EL_BETON);
-  else
+  else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
     DrawMiniElement(sx, sy, Feld[x][y]);
+  else if (x == -1 && y == -1)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_UPPER_LEFT);
+  else if (x == lev_fieldx && y == -1)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_UPPER_RIGHT);
+  else if (x == -1 && y == lev_fieldy)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_LOWER_LEFT);
+  else if (x == lev_fieldx && y == lev_fieldy)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_LOWER_RIGHT);
+  else if (x == -1 || x == lev_fieldx)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_VERTICAL);
+  else if (y == -1 || y == lev_fieldy)
+    DrawMiniGraphic(sx, sy, GFX_STEEL_HORIZONTAL);
 }
 
 void DrawMicroElement(int xpos, int ypos, int element)