rnd-20051213-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index e80c5c49ae185299f3b5de3207c9573094f3166f..6e3a8293a7ac1ba942359dbe3a976a39f79f1aaa 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -651,7 +651,6 @@
 #define MIN_ELEMENT_CONTENTS   1
 #define STD_ELEMENT_CONTENTS   4
 #define MAX_ELEMENT_CONTENTS   8
-#define NUM_MAGIC_BALL_CONTENTS        8
 
 #define LEVEL_SCORE_ELEMENTS   16      /* level elements with score */
 
@@ -1290,9 +1289,41 @@
 #define ACTION_SLURPED_BY_SPRING       49
 #define ACTION_TWINKLING               50
 #define ACTION_SPLASHING               51
-#define ACTION_OTHER                   52
-
-#define NUM_ACTIONS                    53
+#define ACTION_PAGE_1                  52
+#define ACTION_PAGE_2                  53
+#define ACTION_PAGE_3                  54
+#define ACTION_PAGE_4                  55
+#define ACTION_PAGE_5                  56
+#define ACTION_PAGE_6                  57
+#define ACTION_PAGE_7                  58
+#define ACTION_PAGE_8                  59
+#define ACTION_PAGE_9                  60
+#define ACTION_PAGE_10                 61
+#define ACTION_PAGE_11                 62
+#define ACTION_PAGE_12                 63
+#define ACTION_PAGE_13                 64
+#define ACTION_PAGE_14                 65
+#define ACTION_PAGE_15                 66
+#define ACTION_PAGE_16                 67
+#define ACTION_PAGE_17                 68
+#define ACTION_PAGE_18                 69
+#define ACTION_PAGE_19                 70
+#define ACTION_PAGE_20                 71
+#define ACTION_PAGE_21                 72
+#define ACTION_PAGE_22                 73
+#define ACTION_PAGE_23                 74
+#define ACTION_PAGE_24                 75
+#define ACTION_PAGE_25                 76
+#define ACTION_PAGE_26                 77
+#define ACTION_PAGE_27                 78
+#define ACTION_PAGE_28                 79
+#define ACTION_PAGE_29                 80
+#define ACTION_PAGE_30                 81
+#define ACTION_PAGE_31                 82
+#define ACTION_PAGE_32                 83
+#define ACTION_OTHER                   84
+
+#define NUM_ACTIONS                    85
 
 #define ACTION_BORING_LAST             ACTION_BORING_10
 #define ACTION_SLEEPING_LAST           ACTION_SLEEPING_3
@@ -1353,8 +1384,9 @@
 #define GFX_ARG_POST_DELAY_RANDOM      35
 #define GFX_ARG_NAME                   36
 #define GFX_ARG_SCALE_UP_FACTOR                37
+#define GFX_ARG_CLONE_FROM             38
 
-#define NUM_GFX_ARGS                   38
+#define NUM_GFX_ARGS                   39
 
 
 /* values for sound configuration suffixes */
@@ -1437,9 +1469,9 @@
 
 /* program information and versioning definitions */
 
-#define RELEASE_311                    FALSE
+#define RELEASE_3_1_2                  FALSE
 
-#if RELEASE_311
+#if RELEASE_3_1_2
 #define PROGRAM_VERSION_MAJOR          3
 #define PROGRAM_VERSION_MINOR          1
 #define PROGRAM_VERSION_PATCH          2
@@ -1449,7 +1481,7 @@
 #define PROGRAM_VERSION_MAJOR          3
 #define PROGRAM_VERSION_MINOR          2
 #define PROGRAM_VERSION_PATCH          0
-#define PROGRAM_VERSION_BUILD          3
+#define PROGRAM_VERSION_BUILD          5
 #endif
 
 #define PROGRAM_TITLE_STRING           "Rocks'n'Diamonds"
@@ -1551,6 +1583,11 @@ struct HiScore
   int Score;
 };
 
+struct Content
+{
+  int e[3][3];
+};
+
 struct PlayerInfo
 {
   boolean present;             /* player present in level playfield */
@@ -1619,6 +1656,7 @@ struct PlayerInfo
 
   int move_delay;
   int move_delay_value;
+  int move_delay_value_next;
   int move_delay_reset_counter;
 
   int push_delay;
@@ -1688,7 +1726,7 @@ struct LevelInfo
 
   int score[LEVEL_SCORE_ELEMENTS];
 
-  int yamyam_content[MAX_ELEMENT_CONTENTS][3][3];
+  struct Content yamyam_content[MAX_ELEMENT_CONTENTS];
   int num_yamyam_contents;
 
   int amoeba_speed;
@@ -1711,7 +1749,7 @@ struct LevelInfo
   int lenses_time;
   int magnify_time;
   int wind_direction_initial;
-  int ball_content[NUM_MAGIC_BALL_CONTENTS][3][3];
+  struct Content ball_content[MAX_ELEMENT_CONTENTS];
   boolean android_array[16];
 
   int can_move_into_acid_bits; /* bitfield to store property for elements */
@@ -1852,7 +1890,7 @@ struct ElementChangeInfo
 
   short trigger_element;       /* element triggering change */
 
-  int target_content[3][3];    /* elements for extended change target */
+  struct Content target_content;/* elements for extended change target */
   boolean use_target_content;  /* use extended change target */
   boolean only_if_complete;    /* only use complete target content */
   boolean use_random_replace;  /* use random value for replacing elements */
@@ -1963,7 +2001,7 @@ struct ElementInfo
 
   int slippery_type;           /* how/where other elements slip away */
 
-  int content[3][3];           /* new elements after explosion */
+  struct Content content;      /* new elements after explosion */
 
   int explosion_type;          /* type of explosion, like 3x3, 3+3 or 1x1 */
   int explosion_delay;         /* duration of explosion of this element */
@@ -2018,6 +2056,9 @@ struct FontInfo
 struct GraphicInfo
 {
   Bitmap *bitmap;
+  int src_image_width;         /* scaled bitmap size, but w/o small images */
+  int src_image_height;                /* scaled bitmap size, but w/o small images */
+
   int src_x, src_y;            /* start position of animation frames */
   int width, height;           /* width/height of each animation frame */
   int offset_x, offset_y;      /* x/y offset to next animation frame */
@@ -2034,6 +2075,7 @@ struct GraphicInfo
   int diggable_like;           /* element for cloning digging graphics */
   int border_size;             /* border size for "crumbled" graphics */
   int scale_up_factor;         /* optional factor for scaling image up */
+  int clone_from;              /* graphic for cloning *all* settings */
 
   int anim_delay_fixed;                /* optional delay values for bored and   */
   int anim_delay_random;       /* sleeping player animations (animation */