X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=9e164247be52a1ffedf90684e615cffd91c6fc7a;hb=52a85693c5f161b8f70f62d036822dea187ecf6e;hp=845f471237cda7d1900ed2fb6af53a6d3dd1c8ac;hpb=0e571d5d795b7ab85fd0f57f0a9e71295dac86f2;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 845f4712..9e164247 100644 --- a/src/main.h +++ b/src/main.h @@ -1634,8 +1634,13 @@ #define EL_MM_WOODEN_GRID_FIXED_END EL_MM_WOODEN_GRID_FIXED_03 #define EL_MM_FUEL_EMPTY (EL_MM_START + 155) -#define EL_MM_END_1 (EL_MM_START + 155) -#define EL_MM_START_2 (EL_MM_START + 156) +#define EL_MM_UNUSED_156 (EL_MM_START + 156) +#define EL_MM_UNUSED_157 (EL_MM_START + 157) +#define EL_MM_UNUSED_158 (EL_MM_START + 158) +#define EL_MM_UNUSED_159 (EL_MM_START + 159) + +#define EL_MM_END_1 (EL_MM_START + 159) +#define EL_MM_START_2 (EL_MM_START + 160) #define EL_DF_START EL_MM_START_2 #define EL_DF_START2 (EL_DF_START - 240) @@ -1836,22 +1841,22 @@ #define EL_MM_BEAMER_BLUE_16 (EL_MM_BEAMER_BLUE_START + 15) #define EL_MM_BEAMER_BLUE_END EL_MM_BEAMER_BLUE_16 -#define EL_MM_MCDUFFIN 1200 -#define EL_MM_PACMAN 1201 -#define EL_MM_FUSE 1202 -#define EL_MM_STEEL_WALL 1203 -#define EL_MM_WOODEN_WALL 1204 -#define EL_MM_ICE_WALL 1205 -#define EL_MM_AMOEBA_WALL 1206 -#define EL_DF_LASER 1207 -#define EL_DF_RECEIVER 1208 -#define EL_DF_STEEL_WALL 1209 -#define EL_DF_WOODEN_WALL 1210 +#define EL_MM_MCDUFFIN 1204 +#define EL_MM_PACMAN 1205 +#define EL_MM_FUSE 1206 +#define EL_MM_STEEL_WALL 1207 +#define EL_MM_WOODEN_WALL 1208 +#define EL_MM_ICE_WALL 1209 +#define EL_MM_AMOEBA_WALL 1210 +#define EL_DF_LASER 1211 +#define EL_DF_RECEIVER 1212 +#define EL_DF_STEEL_WALL 1213 +#define EL_DF_WOODEN_WALL 1214 #define EL_MM_END_2 (EL_DF_START2 + 430) #define EL_MM_END EL_MM_END_2 -#define NUM_FILE_ELEMENTS 1211 +#define NUM_FILE_ELEMENTS 1215 /* "real" (and therefore drawable) runtime elements */ @@ -1934,8 +1939,12 @@ #define EL_MM_GRAY_BALL_OPENING (EL_FIRST_RUNTIME_REAL + 74) #define EL_MM_ICE_WALL_SHRINKING (EL_FIRST_RUNTIME_REAL + 75) #define EL_MM_AMOEBA_WALL_GROWING (EL_FIRST_RUNTIME_REAL + 76) +#define EL_MM_PACMAN_EATING_RIGHT (EL_FIRST_RUNTIME_REAL + 77) +#define EL_MM_PACMAN_EATING_UP (EL_FIRST_RUNTIME_REAL + 78) +#define EL_MM_PACMAN_EATING_LEFT (EL_FIRST_RUNTIME_REAL + 79) +#define EL_MM_PACMAN_EATING_DOWN (EL_FIRST_RUNTIME_REAL + 80) -#define NUM_DRAWABLE_ELEMENTS (EL_FIRST_RUNTIME_REAL + 77) +#define NUM_DRAWABLE_ELEMENTS (EL_FIRST_RUNTIME_REAL + 81) #define EL_MM_RUNTIME_START EL_MM_EXIT_OPENING #define EL_MM_RUNTIME_END EL_MM_AMOEBA_WALL_GROWING @@ -3023,6 +3032,8 @@ struct LevelInfo boolean use_custom_template; /* use custom properties from template file */ + boolean file_has_custom_elements; /* set when level file contains CEs */ + boolean no_valid_file; /* set when level file missing or invalid */ boolean no_level_file; /* set when falling back to level template */