removed pre-processor directive for newly added EM engine elements

[rocksndiamonds.git] / src / game_em / emerald.h

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 26032ff428c3486bdc6681c0a4618171e887a2ac..52a81bcead61b0786fb825fd4f4dd1ce6cddd6df 100644 (file)
--- a/src/game_em/emerald.h
+++ b/src/game_em/emerald.h
@@ -48,16 +48,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // constant definitions
 // ----------------------------------------------------------------------------
 
-/* define these to use additional elements */
-#define EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+#define CAVE_WIDTH                     MAX_PLAYFIELD_WIDTH
+#define CAVE_HEIGHT                    MAX_PLAYFIELD_HEIGHT
 
-/* with border for steelwall, if needed (when converted from R'n'D level) */
-#define CAVE_WIDTH                     (MAX_PLAYFIELD_WIDTH  + 2)
-#define CAVE_HEIGHT                    (MAX_PLAYFIELD_HEIGHT + 2)
-
-/* with border for Zborder elements (surrounding the visible playfield) */
-#define CAVE_BUFFER_XOFFSET            1
-#define CAVE_BUFFER_YOFFSET            1
+/* additional padding for Zborder elements and linked cave buffer columns */
+#define CAVE_BUFFER_XOFFSET            4
+#define CAVE_BUFFER_YOFFSET            2
 #define CAVE_BUFFER_WIDTH              (CAVE_WIDTH  + 2 * CAVE_BUFFER_XOFFSET)
 #define CAVE_BUFFER_HEIGHT             (CAVE_HEIGHT + 2 * CAVE_BUFFER_YOFFSET)
 
@@ -90,8 +86,7 @@ enum
   Xacid_7,
   Xacid_8,
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
-  Xfake_acid_1,
+  Xfake_acid_1,                        /* newly added to EM engine */
   Xfake_acid_2,
   Xfake_acid_3,
   Xfake_acid_4,
@@ -99,7 +94,6 @@ enum
   Xfake_acid_6,
   Xfake_acid_7,
   Xfake_acid_8,
-#endif
 
   Xgrass,
   Ygrass_nB,
@@ -399,7 +393,7 @@ enum
   Xfake_grass,
   Xfake_grassB,
 
-  Xfake_amoeba,                /* dripper */
+  Xfake_amoeba,                        /* dripper */
   Xfake_amoebaB,
 
   Xlenses,
@@ -422,12 +416,10 @@ enum
   Xsand_stonesand_4,
   Xsand_stoneout_1,
   Xsand_stoneout_2,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
-  Xsand_stonesand_quickout_1,
+  Xsand_stonesand_quickout_1,  /* newly added to EM engine */
   Xsand_stonesand_quickout_2,
-#endif
 
-  Xslidewall_ns,       /* growing wall */
+  Xslidewall_ns,               /* growing wall */
   Yslidewall_ns_blank,
   Xslidewall_ew,
   Yslidewall_ew_blank,
@@ -521,8 +513,7 @@ enum
   Xalpha_arrow_w,
   Xalpha_copyr,
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
-  Ykey_1_blank,
+  Ykey_1_blank,                        /* newly added to EM engine */
   Ykey_2_blank,
   Ykey_3_blank,
   Ykey_4_blank,
@@ -534,7 +525,6 @@ enum
   Ymagnify_blank,
   Ygrass_blank,
   Ydirt_blank,
-#endif
 
   Xboom_bug,           /* passed from explode to synchro (linked explosion);
                           transition to explode_normal */
@@ -637,6 +627,11 @@ struct LEVEL
   int width;                   /* playfield width */
   int height;                  /* playfield height */
 
+  int left;                    /* playfield left edge */
+  int top;                     /* playfield top edge */
+  int right;                   /* playfield right edge */
+  int bottom;                  /* playfield bottom edge */
+
   int time_seconds;            /* available time (seconds) */
   int time_initial;            /* available time (initial) */
   int time;                    /* time remaining (runtime) */