X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=4f431f8a5f2c83d20b8c540f7320fc57c1e8c653;hb=68ce14c8ea8794fbf2c8af7c7119a514b024f7c4;hp=1108cbf76d19aa265912e6e10eb17313e9f81b10;hpb=c4fa66eaa78cc9381f03aca44aa06da994f6f44d;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 1108cbf7..4f431f8a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -159,19 +159,23 @@
 #define CE_TOUCHED_BY_PLAYER	1
 #define CE_PRESSED_BY_PLAYER	2
 #define CE_PUSHED_BY_PLAYER	3
-#define CE_IMPACT		4
-#define CE_SMASHED		5
-#define CE_OTHER_COLLECTING	6
-#define CE_OTHER_PUSHING	7
-#define CE_OTHER_CHANGING	8
-#define CE_OTHER_EXPLODING	9
+#define CE_COLLISION		4
+#define CE_IMPACT		5
+#define CE_SMASHED		6
+#define CE_OTHER_IS_TOUCHING	7
+#define CE_OTHER_IS_CHANGING	8
+#define CE_OTHER_IS_EXPLODING	9
+#define CE_OTHER_GETS_TOUCHED	10
+#define CE_OTHER_GETS_PRESSED	11
+#define CE_OTHER_GETS_PUSHED	12
+#define CE_OTHER_GETS_COLLECTED	13
 
 /* values for internal purpose only (level editor) */
-#define CE_BY_PLAYER		10
-#define CE_IMPACT_SMASHED	11
-#define CE_BY_OTHER		12
+#define CE_BY_PLAYER		14
+#define CE_BY_COLLISION		15
+#define CE_BY_OTHER		16
 
-#define NUM_CHANGE_EVENTS	13
+#define NUM_CHANGE_EVENTS	17
 
 #define CE_BITMASK_DEFAULT	0
 
@@ -190,6 +194,32 @@
 #define CP_HALF_DESTRUCTIVE	1
 #define CP_FULL_DESTRUCTIVE	2
 
+/* values for special move patterns (bits 0-3: basic move directions) */
+#define MV_BIT_TOWARDS_PLAYER	4
+#define MV_BIT_AWAY_FROM_PLAYER	5
+#define MV_BIT_ALONG_LEFT_SIDE	6
+#define MV_BIT_ALONG_RIGHT_SIDE	7
+#define MV_BIT_TURNING_LEFT	8
+#define MV_BIT_TURNING_RIGHT	9
+
+/* values for special move patterns for custom elements */
+#define MV_HORIZONTAL		(MV_LEFT | MV_RIGHT)
+#define MV_VERTICAL		(MV_UP | MV_DOWN)
+#define MV_ALL_DIRECTIONS	(MV_HORIZONTAL | MV_VERTICAL)
+#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)
+#define MV_ALONG_LEFT_SIDE	(1 << MV_BIT_ALONG_LEFT_SIDE)
+#define MV_ALONG_RIGHT_SIDE	(1 << MV_BIT_ALONG_RIGHT_SIDE)
+#define MV_TURNING_LEFT		(1 << MV_BIT_TURNING_LEFT)
+#define MV_TURNING_RIGHT	(1 << MV_BIT_TURNING_RIGHT)
+
+/* values for slippery property for custom elements */
+#define SLIPPERY_ANY_RANDOM	0
+#define SLIPPERY_ANY_LEFT_RIGHT	1
+#define SLIPPERY_ANY_RIGHT_LEFT	2
+#define SLIPPERY_ONLY_LEFT	3
+#define SLIPPERY_ONLY_RIGHT	4
 
 /* macros for configurable properties */
 #define IS_DIGGABLE(e)		HAS_PROPERTY(e, EP_DIGGABLE)
@@ -317,6 +347,7 @@
 /* boundaries of arrays etc. */
 #define MAX_LEVEL_NAME_LEN	32
 #define MAX_LEVEL_AUTHOR_LEN	32
+#define MAX_ELEMENT_NAME_LEN	32
 #define MAX_TAPELEN		(1000 * 50)	/* max. time * framerate */
 #define MAX_SCORE_ENTRIES	100
 #define MAX_NUM_AMOEBA		100
@@ -933,8 +964,8 @@
 #define PROGRAM_VERSION_MAJOR	2
 #define PROGRAM_VERSION_MINOR	2
 #define PROGRAM_VERSION_PATCH	0
-#define PROGRAM_VERSION_RELEASE	7
-#define PROGRAM_VERSION_STRING	"2.2.0rc7"
+#define PROGRAM_VERSION_RELEASE	8
+#define PROGRAM_VERSION_STRING	"2.2.0rc8"
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
@@ -1081,6 +1112,10 @@ struct LevelInfo
   boolean gravity;
   boolean em_slippery_gems;	/* EM style "gems slip from wall" behaviour */
 
+  short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+
+  boolean use_custom_template;	/* use custom properties from template file */
+
   boolean no_level_file;
 };
 
@@ -1171,17 +1206,19 @@ struct ElementChangeInfo
 {
   unsigned long events;		/* bitfield for change events */
 
+  short target_element;		/* target element after change */
+
   int delay_fixed;		/* added frame delay before changed (fixed) */
   int delay_random;		/* added frame delay before changed (random) */
   int delay_frames;		/* either 1 (frames) or 50 (seconds; 50 fps) */
 
-  short trigger;		/* custom element triggering change */
-
-  short target_element;		/* target element after change */
+  short trigger_element;	/* custom element triggering change */
 
   int content[3][3];		/* new elements after extended change */
   boolean use_content;		/* use extended change content */
   boolean only_complete;	/* only use complete content */
+  boolean use_random_change;	/* use random value for setting content */
+  int random;			/* random value for setting content */
   int power;			/* power of extended change */
 
   boolean explode;		/* explode instead of change */
@@ -1199,8 +1236,9 @@ struct ElementInfo
 
   char *token_name;		/* element token used in config files */
   char *class_name;		/* element class used in config files */
-  char *editor_description;	/* short description for level editor */
-  char *custom_description;	/* custom description for level editor */
+  char *editor_description;	/* pre-defined description for level editor */
+  char *custom_description;	/* alternative description from config file */
+  char description[MAX_ELEMENT_NAME_LEN + 1];	/* for custom elements */
 
   /* ---------- graphic and sound definitions ---------- */
 
@@ -1214,9 +1252,7 @@ struct ElementInfo
 
   /* ---------- special element property values ---------- */
 
-  boolean use_template;		/* use all properties from template file */
-
-  boolean use_gfx_element;
+  boolean use_gfx_element;	/* use custom graphic element */
   short gfx_element;		/* optional custom graphic element */
 
   int score;			/* score value for collecting */
@@ -1231,9 +1267,27 @@ struct ElementInfo
   int move_direction_initial;	/* initial direction element moves to */
   int move_stepsize;		/* step size element moves with */
 
+  int slippery_type;		/* how/where other elements slip away */
+
   int content[3][3];		/* new elements after explosion */
 
   struct ElementChangeInfo change;
+
+  /* ---------- internal values used in level editor ---------- */
+
+  int access_type;		/* walkable or passable */
+  int access_layer;		/* accessible over/inside/under */
+  int walk_to_action;		/* diggable/collectible/pushable */
+  int smash_targets;		/* can smash player/enemies/everything */
+  int deadliness;		/* deadly when running/colliding/touching */
+  int consistency;		/* indestructible/can explode */
+  int change_player_action;	/* touched/pressed/pushed by player */
+  int change_collide_action;	/* collision/impact/smashed */
+  int change_other_action;	/* various change actions */
+
+  boolean can_explode_by_fire;	/* element explodes by fire */
+  boolean can_explode_smashed;	/* element explodes when smashed */
+  boolean can_explode_impact;	/* element explodes on impact */
 };
 
 struct FontInfo
@@ -1315,7 +1369,6 @@ extern boolean			redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int			redraw_x1, redraw_y1;
 
 extern short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern short			Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -1326,6 +1379,7 @@ extern short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean			Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean			Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern boolean			Changing[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			AmoebaCnt[MAX_NUM_AMOEBA];
@@ -1365,7 +1419,7 @@ extern boolean			network_player_action_received;
 
 extern int			graphics_action_mapping[];
 
-extern struct LevelInfo		level;
+extern struct LevelInfo		level, level_template;
 extern struct PlayerInfo	stored_player[], *local_player;
 extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;