X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=b483378e3e9441bfd6aa7b068256ac3c73505da6;hb=d42e0a36609c7990f8b9f6fcd80f37f65bcf5149;hp=490af4fafb5236a26903fffb5a5ca1a65d5dc8a3;hpb=3fd9eb037de275a9e65a712d7fbc0d95fe7b2747;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 490af4fa..b483378e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -211,7 +211,7 @@
 				  (CH_EVENT_VAR(e) |=  CH_EVENT_BIT(c)) : \
 				  (CH_EVENT_VAR(e) &= ~CH_EVENT_BIT(c))) : 0)
 
-/* values for change sides for custom elements */
+/* values for change side for custom elements */
 #define CH_SIDE_NONE		MV_NO_MOVING
 #define CH_SIDE_LEFT		MV_LEFT
 #define CH_SIDE_RIGHT		MV_RIGHT
@@ -221,6 +221,19 @@
 #define CH_SIDE_TOP_BOTTOM	MV_VERTICAL
 #define CH_SIDE_ANY		MV_ANY_DIRECTION
 
+/* values for change player for custom elements */
+#define CH_PLAYER_NONE		0
+#define CH_PLAYER_1		(1 << 0)
+#define CH_PLAYER_2		(1 << 1)
+#define CH_PLAYER_3		(1 << 2)
+#define CH_PLAYER_4		(1 << 3)
+#define CH_PLAYER_ANY		(CH_PLAYER_1 | CH_PLAYER_2 | CH_PLAYER_3 | \
+				 CH_PLAYER_4)
+
+/* values for change page for custom elements */
+#define CH_PAGE_ANY_FILE	(0xff)
+#define CH_PAGE_ANY		(0xffffffff)
+
 /* values for change power for custom elements */
 #define CP_NON_DESTRUCTIVE	0
 #define CP_HALF_DESTRUCTIVE	1
@@ -243,8 +256,8 @@
 
 /* values for custom move patterns */
 #define MV_HORIZONTAL		(MV_LEFT | MV_RIGHT)
-#define MV_VERTICAL		(MV_UP | MV_DOWN)
-#define MV_ALL_DIRECTIONS	(MV_HORIZONTAL | MV_VERTICAL)
+#define MV_VERTICAL		(MV_UP   | MV_DOWN)
+#define MV_ALL_DIRECTIONS	(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
 #define MV_ANY_DIRECTION	(MV_ALL_DIRECTIONS)
 #define MV_TOWARDS_PLAYER	(1 << MV_BIT_TOWARDS_PLAYER)
 #define MV_AWAY_FROM_PLAYER	(1 << MV_BIT_AWAY_FROM_PLAYER)
@@ -1279,7 +1292,10 @@ struct PlayerInfo
   boolean connected;		/* player connected (locally or via network) */
   boolean active;		/* player present and connected */
 
-  int index_nr, client_nr, element_nr;
+  int index_nr;			/* player number (0 to 3) */
+  int index_bit;		/* player number bit (1 << 0 to 1 << 3) */
+  int element_nr;		/* element (EL_PLAYER_1 to EL_PLAYER_4) */
+  int client_nr;		/* network client identifier */
 
   byte action;			/* action from local input device */
   byte effective_action;	/* action acknowledged from network server
@@ -1356,6 +1372,7 @@ struct PlayerInfo
   int shield_deadly_time_left;
 
   int inventory_element[MAX_INVENTORY_SIZE];
+  int inventory_infinite_element;
   int inventory_size;
 };
 
@@ -1406,7 +1423,7 @@ struct LevelInfo
   int time_light;
   int time_timegate;
 
-  int can_move_into_acid;	/* bits indicate property for element groups */
+  int can_move_into_acid_bits;	/* bits indicate property for element groups */
 
   boolean double_speed;
   boolean initial_gravity;
@@ -1415,11 +1432,13 @@ struct LevelInfo
   boolean sp_block_last_field;	/* player blocks previous field while moving */
   boolean use_spring_bug;	/* for compatibility with old levels */
 
+  int use_step_counter;		/* count steps instead of seconds for level */
+
   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
   boolean use_custom_template;	/* use custom properties from template file */
 
-  boolean no_level_file;	/* set for currently undefined levels */
+  boolean no_valid_file;	/* set when level file missing or invalid */
 };
 
 struct TapeInfo
@@ -1453,6 +1472,8 @@ struct TapeInfo
     byte action[MAX_PLAYERS];
     byte delay;
   } pos[MAX_TAPELEN];
+
+  boolean no_valid_file;	/* set when tape file missing or invalid */
 };
 
 struct GameInfo
@@ -1506,8 +1527,9 @@ struct ElementChangeInfo
   boolean can_change;		/* use or ignore this change info */
 
   unsigned long events;		/* change events */
-  int sides;			/* change sides */
+
   int trigger_player;		/* player triggering change */
+  int trigger_side;		/* side triggering change */
   int trigger_page;		/* page triggering change */
 
   short target_element;		/* target element after change */
@@ -1826,7 +1848,7 @@ extern int			ZX, ZY;
 extern int			ExitX, ExitY;
 extern int			AllPlayersGone;
 
-extern int			TimeFrames, TimePlayed, TimeLeft;
+extern int			TimeFrames, TimePlayed, TimeLeft, TapeTime;
 extern boolean			SiebAktiv;
 extern int			SiebCount;