rnd-20031004-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index ef941752bce33bef635740429830c178f531ec3a..e860375cdecc20ae218d6356b9fe72bbdd79864c 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -14,9 +14,6 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -182,11 +179,10 @@
 #define CE_LEFT_BY_PLAYER      22
 #define CE_OTHER_GETS_ENTERED  23
 #define CE_OTHER_GETS_LEFT     24
+#define CE_SWITCHED_BY_PLAYER  25
+#define CE_OTHER_GETS_SWITCHED 26
 
-/* values for derived change events (determined from properties above) */
-#define CE_TOUCHING_SOME_SIDE  25      /* summarized left/right/up/down/any */
-
-#define NUM_CHANGE_EVENTS      26
+#define NUM_CHANGE_EVENTS      27
 
 #define CE_BITMASK_DEFAULT     0
 
@@ -204,6 +200,7 @@
                                  (CH_EVENT_VAR(e) &= ~CH_EVENT_BIT(c))) : 0)
 
 /* values for change sides for custom elements */
+#define CH_SIDE_NONE           MV_NO_MOVING
 #define CH_SIDE_LEFT           MV_LEFT
 #define CH_SIDE_RIGHT          MV_RIGHT
 #define CH_SIDE_TOP            MV_UP
@@ -224,6 +221,7 @@
 #define MV_BIT_ALONG_RIGHT_SIDE        7
 #define MV_BIT_TURNING_LEFT    8
 #define MV_BIT_TURNING_RIGHT   9
+#define MV_BIT_WHEN_PUSHED     10
 
 /* values for special move patterns for custom elements */
 #define MV_HORIZONTAL          (MV_LEFT | MV_RIGHT)
@@ -236,6 +234,7 @@
 #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)
+#define MV_WHEN_PUSHED         (1 << MV_BIT_WHEN_PUSHED)
 
 /* values for slippery property for custom elements */
 #define SLIPPERY_ANY_RANDOM    0
@@ -986,20 +985,24 @@
 #define FONT_TEXT_2                            13
 #define FONT_TEXT_3                            14
 #define FONT_TEXT_4                            15
-#define FONT_INPUT_1_ACTIVE                    16
-#define FONT_INPUT_2_ACTIVE                    17
-#define FONT_INPUT_1                           18
-#define FONT_INPUT_2                           19
-#define FONT_OPTION_OFF                                20
-#define FONT_OPTION_ON                         21
-#define FONT_VALUE_1                           22
-#define FONT_VALUE_2                           23
-#define FONT_VALUE_OLD                         24
-#define FONT_LEVEL_NUMBER                      25
-#define FONT_TAPE_RECORDER                     26
-#define FONT_GAME_INFO                         27
-
-#define NUM_FONTS                              28
+#define FONT_ENVELOPE_1                                16
+#define FONT_ENVELOPE_2                                17
+#define FONT_ENVELOPE_3                                18
+#define FONT_ENVELOPE_4                                19
+#define FONT_INPUT_1_ACTIVE                    20
+#define FONT_INPUT_2_ACTIVE                    21
+#define FONT_INPUT_1                           22
+#define FONT_INPUT_2                           23
+#define FONT_OPTION_OFF                                24
+#define FONT_OPTION_ON                         25
+#define FONT_VALUE_1                           26
+#define FONT_VALUE_2                           27
+#define FONT_VALUE_OLD                         28
+#define FONT_LEVEL_NUMBER                      29
+#define FONT_TAPE_RECORDER                     30
+#define FONT_GAME_INFO                         31
+
+#define NUM_FONTS                              32
 #define NUM_INITIAL_FONTS                      4
 
 /* values for game_status (must match special image configuration suffixes) */
@@ -1020,9 +1023,9 @@
 
 #define PROGRAM_VERSION_MAJOR  3
 #define PROGRAM_VERSION_MINOR  0
-#define PROGRAM_VERSION_PATCH  5
+#define PROGRAM_VERSION_PATCH  6
 #define PROGRAM_VERSION_RELEASE        0
-#define PROGRAM_VERSION_STRING "3.0.5"
+#define PROGRAM_VERSION_STRING "3.0.6"
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"