X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=a5f90d7a2173aff463c1d147306987df3f85d2e6;hb=40aa8a64f516da6baf703b44d141b37c291553df;hp=f9ffaac88eb05fd1a4231cacdcddab8bdef8a9e0;hpb=c4245ac7001dbd6a10e085ac72962611f43a1e90;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index f9ffaac8..a5f90d7a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -75,6 +75,7 @@
 					((x) >= (xmin) && (x) <= (xmax) && \
 					 (y) >= (ymin) && (y) <= (ymax))
 
+#define IN_PIX_FIELD(x, y)		IN_FIELD(x, y, SXSIZE, SYSIZE)
 #define IN_VIS_FIELD(x, y)		IN_FIELD(x, y, SCR_FIELDX, SCR_FIELDY)
 #define IN_LEV_FIELD(x, y)		IN_FIELD(x, y, lev_fieldx, lev_fieldy)
 #define IN_SCR_FIELD(x, y)		IN_FIELD_MINMAX(x,y, BX1,BY1, BX2,BY2)
@@ -1616,30 +1617,30 @@
 #define EL_MM_PACMAN_LEFT		(EL_MM_PACMAN_START + 2)
 #define EL_MM_PACMAN_DOWN		(EL_MM_PACMAN_START + 3)
 #define EL_MM_PACMAN_END		EL_MM_PACMAN_DOWN
-#define EL_MM_POLARISATOR_START		(EL_MM_START + 119)
-#define EL_MM_POLARISATOR_1		(EL_MM_POLARISATOR_START + 0)
-#define EL_MM_POLARISATOR_2		(EL_MM_POLARISATOR_START + 1)
-#define EL_MM_POLARISATOR_3		(EL_MM_POLARISATOR_START + 2)
-#define EL_MM_POLARISATOR_4		(EL_MM_POLARISATOR_START + 3)
-#define EL_MM_POLARISATOR_5		(EL_MM_POLARISATOR_START + 4)
-#define EL_MM_POLARISATOR_6		(EL_MM_POLARISATOR_START + 5)
-#define EL_MM_POLARISATOR_7		(EL_MM_POLARISATOR_START + 6)
-#define EL_MM_POLARISATOR_8		(EL_MM_POLARISATOR_START + 7)
-#define EL_MM_POLARISATOR_9		(EL_MM_POLARISATOR_START + 8)
-#define EL_MM_POLARISATOR_10		(EL_MM_POLARISATOR_START + 9)
-#define EL_MM_POLARISATOR_11		(EL_MM_POLARISATOR_START + 10)
-#define EL_MM_POLARISATOR_12		(EL_MM_POLARISATOR_START + 11)
-#define EL_MM_POLARISATOR_13		(EL_MM_POLARISATOR_START + 12)
-#define EL_MM_POLARISATOR_14		(EL_MM_POLARISATOR_START + 13)
-#define EL_MM_POLARISATOR_15		(EL_MM_POLARISATOR_START + 14)
-#define EL_MM_POLARISATOR_16		(EL_MM_POLARISATOR_START + 15)
-#define EL_MM_POLARISATOR_END		EL_MM_POLARISATOR_15
-#define EL_MM_POLARISATOR_CROSS_START	(EL_MM_START + 135)
-#define EL_MM_POLARISATOR_CROSS_1	(EL_MM_POLARISATOR_CROSS_START + 0)
-#define EL_MM_POLARISATOR_CROSS_2	(EL_MM_POLARISATOR_CROSS_START + 1)
-#define EL_MM_POLARISATOR_CROSS_3	(EL_MM_POLARISATOR_CROSS_START + 2)
-#define EL_MM_POLARISATOR_CROSS_4	(EL_MM_POLARISATOR_CROSS_START + 3)
-#define EL_MM_POLARISATOR_CROSS_END	EL_MM_POLARISATOR_CROSS_03
+#define EL_MM_POLARIZER_START		(EL_MM_START + 119)
+#define EL_MM_POLARIZER_1		(EL_MM_POLARIZER_START + 0)
+#define EL_MM_POLARIZER_2		(EL_MM_POLARIZER_START + 1)
+#define EL_MM_POLARIZER_3		(EL_MM_POLARIZER_START + 2)
+#define EL_MM_POLARIZER_4		(EL_MM_POLARIZER_START + 3)
+#define EL_MM_POLARIZER_5		(EL_MM_POLARIZER_START + 4)
+#define EL_MM_POLARIZER_6		(EL_MM_POLARIZER_START + 5)
+#define EL_MM_POLARIZER_7		(EL_MM_POLARIZER_START + 6)
+#define EL_MM_POLARIZER_8		(EL_MM_POLARIZER_START + 7)
+#define EL_MM_POLARIZER_9		(EL_MM_POLARIZER_START + 8)
+#define EL_MM_POLARIZER_10		(EL_MM_POLARIZER_START + 9)
+#define EL_MM_POLARIZER_11		(EL_MM_POLARIZER_START + 10)
+#define EL_MM_POLARIZER_12		(EL_MM_POLARIZER_START + 11)
+#define EL_MM_POLARIZER_13		(EL_MM_POLARIZER_START + 12)
+#define EL_MM_POLARIZER_14		(EL_MM_POLARIZER_START + 13)
+#define EL_MM_POLARIZER_15		(EL_MM_POLARIZER_START + 14)
+#define EL_MM_POLARIZER_16		(EL_MM_POLARIZER_START + 15)
+#define EL_MM_POLARIZER_END		EL_MM_POLARIZER_15
+#define EL_MM_POLARIZER_CROSS_START	(EL_MM_START + 135)
+#define EL_MM_POLARIZER_CROSS_1		(EL_MM_POLARIZER_CROSS_START + 0)
+#define EL_MM_POLARIZER_CROSS_2		(EL_MM_POLARIZER_CROSS_START + 1)
+#define EL_MM_POLARIZER_CROSS_3		(EL_MM_POLARIZER_CROSS_START + 2)
+#define EL_MM_POLARIZER_CROSS_4		(EL_MM_POLARIZER_CROSS_START + 3)
+#define EL_MM_POLARIZER_CROSS_END	EL_MM_POLARIZER_CROSS_03
 #define EL_MM_MIRROR_FIXED_START	(EL_MM_START + 139)
 #define EL_MM_MIRROR_FIXED_1		(EL_MM_MIRROR_FIXED_START + 0)
 #define EL_MM_MIRROR_FIXED_2		(EL_MM_MIRROR_FIXED_START + 1)
@@ -2765,6 +2766,7 @@ struct DoorInfo
   int height;
   int step_offset;
   int step_delay;
+  int post_delay;
   int anim_mode;
 };
 
@@ -2816,6 +2818,8 @@ struct EditorSettingsInfo
   struct XY element_name;
 
   struct EditorTabsInfo tabs;
+
+  struct XY tooltip;
 };
 
 struct EditorGadgetInfo