X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=68ad89ca303d0a240c3c656f0e3d25204e26c355;hb=c42450df0ac6ff7b6db97bf0df12b9c73055c727;hp=7f08589684579efcaff1327e7667727356b56afc;hpb=b2393704a33e74b80e6e18360f9e243973982e2e;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 7f085896..68ad89ca 100644
--- a/src/main.h
+++ b/src/main.h
@@ -156,7 +156,7 @@
 				 (PROPERTY_VAR(e,p) &= ~PROPERTY_BIT(p)))
 
 
-/* values for change events for custom elements */
+/* values for change events for custom elements (stored in level file) */
 #define CE_DELAY		0
 #define CE_TOUCHED_BY_PLAYER	1
 #define CE_PRESSED_BY_PLAYER	2
@@ -174,7 +174,7 @@
 #define CE_OTHER_GETS_COLLECTED	14
 #define CE_OTHER_GETS_DROPPED	15
 
-/* values for internal purpose only (level editor) */
+/* values for activating change events (also stored in level file!) */
 #define CE_BY_PLAYER		16
 #define CE_BY_COLLISION		17
 #define CE_BY_OTHER		18
@@ -184,10 +184,13 @@
 #define CE_BITMASK_DEFAULT	0
 
 #define CH_EVENT_BIT(c)		(1 << (c))
-#define CH_EVENT_VAR(e)		(element_info[e].change.events)
+#define CH_EVENT_VAR(e)		(element_info[e].change->events)
+#define CH_ANY_EVENT_VAR(e)	(element_info[e].change_events)
 
 #define HAS_CHANGE_EVENT(e,c)	(IS_CUSTOM_ELEMENT(e) &&		  \
 				 (CH_EVENT_VAR(e) & CH_EVENT_BIT(c)) != 0)
+#define HAS_ANY_CHANGE_EVENT(e,c) (IS_CUSTOM_ELEMENT(e) &&		  \
+				 (CH_ANY_EVENT_VAR(e) & CH_EVENT_BIT(c)) != 0)
 #define SET_CHANGE_EVENT(e,c,v)	(IS_CUSTOM_ELEMENT(e) ?			  \
 				 ((v) ?					  \
 				  (CH_EVENT_VAR(e) |=  CH_EVENT_BIT(c)) : \
@@ -352,14 +355,28 @@
 #define IS_LOOP_SOUND(s)	(sound_info[s].loop)
 
 
+/* fundamental game speed values */
+#define GAME_FRAME_DELAY	20	/* frame delay in milliseconds */
+#define FFWD_FRAME_DELAY	10	/* 200% speed for fast forward */
+#define FRAMES_PER_SECOND	(1000 / GAME_FRAME_DELAY)
+#define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
+#define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
+
 /* 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_TAPELEN		(1000 * FRAMES_PER_SECOND) /* max.time x fps */
 #define MAX_SCORE_ENTRIES	100
 #define MAX_NUM_AMOEBA		100
 #define MAX_INVENTORY_SIZE	1000
+#define MIN_ENVELOPE_XSIZE	1
+#define MIN_ENVELOPE_YSIZE	1
+#define MAX_ENVELOPE_XSIZE	30
+#define MAX_ENVELOPE_YSIZE	20
+#define MAX_ENVELOPE_TEXT_LEN	(MAX_ENVELOPE_XSIZE * MAX_ENVELOPE_YSIZE)
+#define MIN_CHANGE_PAGES	1
+#define MAX_CHANGE_PAGES	10
 
 /* values for elements with content */
 #define MIN_ELEMENT_CONTENTS	1
@@ -368,13 +385,6 @@
 
 #define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
 
-/* fundamental game speed values */
-#define GAME_FRAME_DELAY	20	/* frame delay in milliseconds */
-#define FFWD_FRAME_DELAY	10	/* 200% speed for fast forward */
-#define FRAMES_PER_SECOND	(1000 / GAME_FRAME_DELAY)
-#define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
-#define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
-
 /* often used screen positions */
 #define SX			8
 #define SY			8
@@ -885,11 +895,12 @@
 #define GFX_SPECIAL_ARG_EDITOR			3
 #define GFX_SPECIAL_ARG_INFO			4
 #define GFX_SPECIAL_ARG_SETUP			5
-#define GFX_SPECIAL_ARG_DOOR			6
-#define GFX_SPECIAL_ARG_PREVIEW			7
-#define GFX_SPECIAL_ARG_CRUMBLED		8
+#define GFX_SPECIAL_ARG_PLAYING			6
+#define GFX_SPECIAL_ARG_DOOR			7
+#define GFX_SPECIAL_ARG_PREVIEW			8
+#define GFX_SPECIAL_ARG_CRUMBLED		9
 
-#define NUM_SPECIAL_GFX_ARGS			9
+#define NUM_SPECIAL_GFX_ARGS			10
 
 
 /* values for image configuration suffixes */
@@ -969,20 +980,20 @@
 #define GAME_MODE_EDITOR			3
 #define GAME_MODE_INFO				4
 #define GAME_MODE_SETUP				5
-#define GAME_MODE_PSEUDO_DOOR			6
-#define GAME_MODE_PSEUDO_PREVIEW		7
-#define GAME_MODE_PSEUDO_CRUMBLED		8
+#define GAME_MODE_PLAYING			6
+#define GAME_MODE_PSEUDO_DOOR			7
+#define GAME_MODE_PSEUDO_PREVIEW		8
+#define GAME_MODE_PSEUDO_CRUMBLED		9
 
 /* there are no special config file suffixes for these modes */
-#define GAME_MODE_PLAYING			9
 #define GAME_MODE_PSEUDO_TYPENAME		10
 #define GAME_MODE_QUIT				11
 
 #define PROGRAM_VERSION_MAJOR	3
 #define PROGRAM_VERSION_MINOR	0
-#define PROGRAM_VERSION_PATCH	1
+#define PROGRAM_VERSION_PATCH	3
 #define PROGRAM_VERSION_RELEASE	0
-#define PROGRAM_VERSION_STRING	"3.0.1"
+#define PROGRAM_VERSION_STRING	"3.0.3"
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
@@ -1112,12 +1123,13 @@ struct LevelInfo
   boolean encoding_16bit_yamyam;	/* yamyam contains 16-bit elements */
   boolean encoding_16bit_amoeba;	/* amoeba contains 16-bit elements */
 
-  int fieldx;
-  int fieldy;
+  int fieldx, fieldy;
   int time;
   int gems_needed;
   char name[MAX_LEVEL_NAME_LEN + 1];
   char author[MAX_LEVEL_AUTHOR_LEN + 1];
+  char envelope[MAX_ENVELOPE_TEXT_LEN + 1];
+  int envelope_xsize, envelope_ysize;
   int score[LEVEL_SCORE_ELEMENTS];
   int yamyam_content[MAX_ELEMENT_CONTENTS][3][3];
   int num_yamyam_contents;
@@ -1135,7 +1147,7 @@ struct LevelInfo
 
   boolean use_custom_template;	/* use custom properties from template file */
 
-  boolean no_level_file;
+  boolean no_level_file;	/* set for currently undefined levels */
 };
 
 struct TapeInfo
@@ -1225,6 +1237,8 @@ struct DoorInfo
 
 struct ElementChangeInfo
 {
+  boolean can_change;		/* use or ignore this change info */
+
   unsigned long events;		/* bitfield for change events */
 
   short target_element;		/* target element after change */
@@ -1249,6 +1263,12 @@ struct ElementChangeInfo
   void (*pre_change_function)(int x, int y);
   void (*change_function)(int x, int y);
   void (*post_change_function)(int x, int y);
+
+  /* ---------- internal values used in level editor ---------- */
+
+  int player_action;		/* touched/pressed/pushed by player */
+  int collide_action;		/* collision/impact/smashed */
+  int other_action;		/* various change actions */
 };
 
 struct ElementInfo
@@ -1297,7 +1317,18 @@ struct ElementInfo
 
   int content[3][3];		/* new elements after explosion */
 
-  struct ElementChangeInfo change;
+  struct ElementChangeInfo *change_page; /* actual list of change pages */
+  struct ElementChangeInfo *change;	 /* pointer to current change page */
+
+  int num_change_pages;		/* actual number of change pages */
+  int current_change_page;	/* currently edited change page */
+
+  /* ---------- internal values used at runtime when playing ---------- */
+
+  unsigned long change_events;	/* bitfield for combined change events */
+
+  int event_page_num[NUM_CHANGE_EVENTS]; /* page number for each event */
+  struct ElementChangeInfo *event_page[NUM_CHANGE_EVENTS]; /* page for event */
 
   /* ---------- internal values used in level editor ---------- */
 
@@ -1307,9 +1338,6 @@ struct ElementInfo
   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 */