X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=4889094c0ee6521af635e08634133c4a9dd8e5b9;hb=632b8ce3e7c946dc6d5e9d1f93a1a8dcb38e510c;hp=af0b57cfd3ecf6ca0e297993b43ff2a5b9110401;hpb=234748b5eb0bc4fe29a36fd25a1d25658f53858a;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index af0b57cf..4889094c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -690,31 +690,30 @@
 #define EL_TIMEGATE_CLOSING		(EL_FIRST_RUNTIME_REAL + 20)
 #define EL_PEARL_BREAKING		(EL_FIRST_RUNTIME_REAL + 21)
 #define EL_TRAP_ACTIVE			(EL_FIRST_RUNTIME_REAL + 22)
-#define EL_SPRING_MOVING		(EL_FIRST_RUNTIME_REAL + 23)
-#define EL_SP_MURPHY_CLONE		(EL_FIRST_RUNTIME_REAL + 24)
-#define EL_QUICKSAND_EMPTYING		(EL_FIRST_RUNTIME_REAL + 25)
-#define EL_MAGIC_WALL_EMPTYING		(EL_FIRST_RUNTIME_REAL + 26)
-#define EL_BD_MAGIC_WALL_EMPTYING	(EL_FIRST_RUNTIME_REAL + 27)
-#define EL_AMOEBA_DRIPPING		(EL_FIRST_RUNTIME_REAL + 28)
-#define EL_SP_EXIT_OPEN			(EL_FIRST_RUNTIME_REAL + 29)
-#define EL_INVISIBLE_STEELWALL_ACTIVE	(EL_FIRST_RUNTIME_REAL + 30)
-#define EL_INVISIBLE_SAND_ACTIVE	(EL_FIRST_RUNTIME_REAL + 31)
-#define EL_INVISIBLE_WALL_ACTIVE	(EL_FIRST_RUNTIME_REAL + 32)
-#define EL_CONVEYOR_BELT1_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 33)
-#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 34)
-#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 35)
-#define EL_CONVEYOR_BELT2_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 36)
-#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 37)
-#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 38)
-#define EL_CONVEYOR_BELT3_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 39)
-#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 40)
-#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 41)
-#define EL_CONVEYOR_BELT4_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 42)
-#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 43)
-#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 44)
+#define EL_SP_MURPHY_CLONE		(EL_FIRST_RUNTIME_REAL + 23)
+#define EL_QUICKSAND_EMPTYING		(EL_FIRST_RUNTIME_REAL + 24)
+#define EL_MAGIC_WALL_EMPTYING		(EL_FIRST_RUNTIME_REAL + 25)
+#define EL_BD_MAGIC_WALL_EMPTYING	(EL_FIRST_RUNTIME_REAL + 26)
+#define EL_AMOEBA_DRIPPING		(EL_FIRST_RUNTIME_REAL + 27)
+#define EL_SP_EXIT_OPEN			(EL_FIRST_RUNTIME_REAL + 28)
+#define EL_INVISIBLE_STEELWALL_ACTIVE	(EL_FIRST_RUNTIME_REAL + 29)
+#define EL_INVISIBLE_SAND_ACTIVE	(EL_FIRST_RUNTIME_REAL + 30)
+#define EL_INVISIBLE_WALL_ACTIVE	(EL_FIRST_RUNTIME_REAL + 31)
+#define EL_CONVEYOR_BELT1_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 32)
+#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 33)
+#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 34)
+#define EL_CONVEYOR_BELT2_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 35)
+#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 36)
+#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 37)
+#define EL_CONVEYOR_BELT3_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 38)
+#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 39)
+#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 40)
+#define EL_CONVEYOR_BELT4_LEFT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 41)
+#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE	(EL_FIRST_RUNTIME_REAL + 42)
+#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE	(EL_FIRST_RUNTIME_REAL + 43)
 
 /* "unreal" (and therefore not drawable) runtime elements */
-#define EL_FIRST_RUNTIME_UNREAL		(EL_FIRST_RUNTIME_REAL + 45)
+#define EL_FIRST_RUNTIME_UNREAL		(EL_FIRST_RUNTIME_REAL + 44)
 
 #define EL_BLOCKED			(EL_FIRST_RUNTIME_UNREAL + 0)
 #define EL_EXPLOSION			(EL_FIRST_RUNTIME_UNREAL + 1)
@@ -1352,13 +1351,17 @@
 #define GFX_ACTION_PASSING		8
 #define GFX_ACTION_IMPACT		9
 #define GFX_ACTION_CRACKING		10
-#define GFX_ACTION_ACTIVATING		11
-#define GFX_ACTION_EATING		12
-#define GFX_ACTION_ATTACKING		13
-#define GFX_ACTION_GROWING		14
-#define GFX_ACTION_OTHER		15
-
-#define NUM_GFX_ACTIONS			16
+#define GFX_ACTION_BREAKING		11
+#define GFX_ACTION_ACTIVATING		12
+#define GFX_ACTION_OPENING		13
+#define GFX_ACTION_CLOSING		14
+#define GFX_ACTION_EATING		15
+#define GFX_ACTION_ATTACKING		16
+#define GFX_ACTION_GROWING		17
+#define GFX_ACTION_SHRINKING		18
+#define GFX_ACTION_OTHER		19
+
+#define NUM_GFX_ACTIONS			20
 #define NUM_GFX_ACTIONS_MAPPED		8
 
 
@@ -1377,6 +1380,9 @@
 #define GFX_ARG_MODE_REVERSE			11
 #define GFX_ARG_GLOBAL_SYNC			12
 
+#define NUM_GFX_ARGS				13
+
+
 /* values for sound configuration suffixes */
 /* (currently none) */
 
@@ -1618,7 +1624,10 @@ struct NewGraphicInfo
 };
 
 extern GC		tile_clip_gc;
+#if 0
 extern Bitmap	       *pix[];
+#endif
+extern Bitmap	       *bitmap_db_field, *bitmap_db_door;
 extern Pixmap		tile_clipmask[];
 extern DrawBuffer      *fieldbuffer;
 extern DrawBuffer      *drawto_field;