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

diff --git a/src/main.h b/src/main.h
index 2be92c6b..8ea48949 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)
@@ -805,6 +820,8 @@
 
 #define IS_LOOP_SOUND(s)	(sound_info[s].loop)
 
+#define IS_SPECIAL_GFX_ARG(a)	((a) >= 0 && (a) < NUM_SPECIAL_GFX_ARGS)
+
 #define EL_CASCADE_ACTIVE(e)	(IS_EDITOR_CASCADE_INACTIVE(e) ? (e) + 1 : (e))
 #define EL_CASCADE_INACTIVE(e)	(IS_EDITOR_CASCADE_ACTIVE(e)   ? (e) - 1 : (e))
 #define EL_CASCADE_TOGGLE(e)	(IS_EDITOR_CASCADE_INACTIVE(e) ? (e) + 1 :    \
@@ -2010,11 +2027,17 @@ struct MenuMainTextInfo
   struct TextPosInfo setup;
   struct TextPosInfo quit;
 
-  struct TextPosInfo current_level;
   struct TextPosInfo first_level;
   struct TextPosInfo last_level;
+  struct TextPosInfo level_number;
   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 +2045,7 @@ struct MenuMainTextInfo
 
 struct MenuMainInputInfo
 {
-  struct MenuPosInfo name;
+  struct TextPosInfo name;
 };
 
 struct MenuMainInfo
@@ -2052,6 +2075,7 @@ struct TitleMessageInfo
   int chars;
   int lines;
   int align;
+  int font;
   boolean autowrap;
   boolean centered;
   boolean skip_comments;