X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=ade881e0e392d1e4921efcb24c6b632b5189a1b1;hb=590e9a86daa2b0d3923673bfe02525766224808e;hp=2be92c6bf151a2d1bdd026243f88e84e3c610fd9;hpb=097cb899f2c98e2f300e081dd09d7db8b0f636a5;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 2be92c6b..ade881e0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -698,7 +698,22 @@
 
 #define IS_ACID_POOL_OR_ACID(e)	(IS_ACID_POOL(e) || (e) == EL_ACID)
 
-#define IS_EMC_PILLAR(e)	((e) >= EL_EMC_WALL_1 && (e) <= EL_EMC_WALL_3)
+#define IS_EMC_PILLAR(e)	((e) >= EL_EMC_WALL_1 &&		\
+				 (e) <= EL_EMC_WALL_3)
+#define IS_SP_CHIP(e)		((e) == EL_SP_CHIP_SINGLE ||		\
+				 (e) == EL_SP_CHIP_LEFT ||		\
+				 (e) == EL_SP_CHIP_RIGHT ||		\
+				 (e) == EL_SP_CHIP_TOP ||		\
+				 (e) == EL_SP_CHIP_BOTTOM)
+#define IS_SP_HARDWARE_BASE(e)	((e) == EL_SP_HARDWARE_BASE_1 ||	\
+				 (e) == EL_SP_HARDWARE_BASE_2 ||	\
+				 (e) == EL_SP_HARDWARE_BASE_3 ||	\
+				 (e) == EL_SP_HARDWARE_BASE_4 ||	\
+				 (e) == EL_SP_HARDWARE_BASE_5 ||	\
+				 (e) == EL_SP_HARDWARE_BASE_6)
+
+#define IS_DC_STEELWALL_2(e)	((e) >= EL_DC_STEELWALL_2_LEFT &&	\
+				 (e) <= EL_DC_STEELWALL_2_SINGLE)
 
 #define GFX_ELEMENT(e)		(element_info[e].use_gfx_element ?	\
 				 element_info[e].gfx_element : e)
@@ -2015,6 +2030,12 @@ struct MenuMainTextInfo
   struct TextPosInfo last_level;
   struct TextPosInfo level_info_1;
   struct TextPosInfo level_info_2;
+  struct TextPosInfo level_name;
+  struct TextPosInfo level_author;
+  struct TextPosInfo level_year;
+  struct TextPosInfo level_imported_from;
+  struct TextPosInfo level_imported_by;
+  struct TextPosInfo level_tested_by;
   struct TextPosInfo title_1;
   struct TextPosInfo title_2;
   struct TextPosInfo title_3;
@@ -2022,7 +2043,7 @@ struct MenuMainTextInfo
 
 struct MenuMainInputInfo
 {
-  struct MenuPosInfo name;
+  struct TextPosInfo name;
 };
 
 struct MenuMainInfo