rnd-19990126-2

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 121b1081d5d4b2a17ada3eea730cfc7bb7a1c7ea..496bc9a6d3c50993782cc1468b351c8f790358bb 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -71,8 +71,6 @@ typedef unsigned char byte;
 #define STD_LEV_FIELDY 32
 #define MAX_LEV_FIELDX 128
 #define MAX_LEV_FIELDY 128
-#define ED_FIELDX      (2 * SCR_FIELDX - 1)
-#define ED_FIELDY      (2 * SCR_FIELDY - 2)
 
 #define MAX_PLAYERS    4
 
@@ -96,7 +94,6 @@ typedef unsigned char byte;
 #define IN_VIS_FIELD(x,y) ((x)>=0 && (x)<SCR_FIELDX && (y)>=0 &&(y)<SCR_FIELDY)
 #define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
 #define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
-#define IN_ED_FIELD(x,y)  ((x)>=0 && (x)<ED_FIELDX && (y)>=0 &&(y)<ED_FIELDY)
 
 #define EP_BIT_AMOEBALIVE      (1 << 0)
 #define EP_BIT_AMOEBOID                (1 << 1)
@@ -532,9 +529,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 +829,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 +972,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 +1080,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)