X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=4e6bd02f0fe3b33a6f2f8413041dbf5b6cf03b8a;hp=9ae8be8755859d1db69733f117162c43f50ae2e8;hb=f5356588a234e34e349c0b1eba02008655fdee87;hpb=0a4bbe85a69ae2fc05d05c2e1fee44f2b1c44134 diff --git a/src/main.h b/src/main.h index 9ae8be87..4e6bd02f 100644 --- a/src/main.h +++ b/src/main.h @@ -679,40 +679,40 @@ extern char *element_info[]; #define EL_SOKOBAN_OBJEKT 67 #define EL_SOKOBAN_FELD_LEER 68 #define EL_SOKOBAN_FELD_VOLL 69 -#define EL_BUTTERFLY_R 70 -#define EL_BUTTERFLY_O 71 -#define EL_BUTTERFLY_L 72 -#define EL_BUTTERFLY_U 73 -#define EL_FIREFLY_R 74 -#define EL_FIREFLY_O 75 -#define EL_FIREFLY_L 76 -#define EL_FIREFLY_U 77 -#define EL_BUTTERFLY_1 EL_BUTTERFLY_U -#define EL_BUTTERFLY_2 EL_BUTTERFLY_L -#define EL_BUTTERFLY_3 EL_BUTTERFLY_O -#define EL_BUTTERFLY_4 EL_BUTTERFLY_R -#define EL_FIREFLY_1 EL_FIREFLY_L -#define EL_FIREFLY_2 EL_FIREFLY_U -#define EL_FIREFLY_3 EL_FIREFLY_R -#define EL_FIREFLY_4 EL_FIREFLY_O +#define EL_BUTTERFLY_RIGHT 70 +#define EL_BUTTERFLY_UP 71 +#define EL_BUTTERFLY_LEFT 72 +#define EL_BUTTERFLY_DOWN 73 +#define EL_FIREFLY_RIGHT 74 +#define EL_FIREFLY_UP 75 +#define EL_FIREFLY_LEFT 76 +#define EL_FIREFLY_DOWN 77 +#define EL_BUTTERFLY_1 EL_BUTTERFLY_DOWN +#define EL_BUTTERFLY_2 EL_BUTTERFLY_LEFT +#define EL_BUTTERFLY_3 EL_BUTTERFLY_UP +#define EL_BUTTERFLY_4 EL_BUTTERFLY_RIGHT +#define EL_FIREFLY_1 EL_FIREFLY_LEFT +#define EL_FIREFLY_2 EL_FIREFLY_DOWN +#define EL_FIREFLY_3 EL_FIREFLY_RIGHT +#define EL_FIREFLY_4 EL_FIREFLY_UP #define EL_BUTTERFLY 78 #define EL_FIREFLY 79 #define EL_SPIELER1 80 #define EL_SPIELER2 81 #define EL_SPIELER3 82 #define EL_SPIELER4 83 -#define EL_KAEFER_R 84 -#define EL_KAEFER_O 85 -#define EL_KAEFER_L 86 -#define EL_KAEFER_U 87 -#define EL_FLIEGER_R 88 -#define EL_FLIEGER_O 89 -#define EL_FLIEGER_L 90 -#define EL_FLIEGER_U 91 -#define EL_PACMAN_R 92 -#define EL_PACMAN_O 93 -#define EL_PACMAN_L 94 -#define EL_PACMAN_U 95 +#define EL_KAEFER_RIGHT 84 +#define EL_KAEFER_UP 85 +#define EL_KAEFER_LEFT 86 +#define EL_KAEFER_DOWN 87 +#define EL_FLIEGER_RIGHT 88 +#define EL_FLIEGER_UP 89 +#define EL_FLIEGER_LEFT 90 +#define EL_FLIEGER_DOWN 91 +#define EL_PACMAN_RIGHT 92 +#define EL_PACMAN_UP 93 +#define EL_PACMAN_LEFT 94 +#define EL_PACMAN_DOWN 95 #define EL_EDELSTEIN_ROT 96 #define EL_EDELSTEIN_LILA 97 #define EL_ERZ_EDEL_ROT 98 @@ -731,13 +731,13 @@ extern char *element_info[]; #define EL_BLACK_ORB 108 #define EL_AMOEBA2DIAM 109 -#define EL_MAULWURF 110 +#define EL_MOLE 110 #define EL_PINGUIN 111 #define EL_SONDE 112 -#define EL_PFEIL_L 113 -#define EL_PFEIL_R 114 -#define EL_PFEIL_O 115 -#define EL_PFEIL_U 116 +#define EL_PFEIL_LEFT 113 +#define EL_PFEIL_RIGHT 114 +#define EL_PFEIL_UP 115 +#define EL_PFEIL_DOWN 116 #define EL_SCHWEIN 117 #define EL_DRACHE 118 @@ -864,27 +864,27 @@ extern char *element_info[]; #define EL_BELT1_LEFT 271 #define EL_BELT1_MIDDLE 272 #define EL_BELT1_RIGHT 273 -#define EL_BELT1_SWITCH_L 274 -#define EL_BELT1_SWITCH_M 275 -#define EL_BELT1_SWITCH_R 276 +#define EL_BELT1_SWITCH_LEFT 274 +#define EL_BELT1_SWITCH_MIDDLE 275 +#define EL_BELT1_SWITCH_RIGHT 276 #define EL_BELT2_LEFT 277 #define EL_BELT2_MIDDLE 278 #define EL_BELT2_RIGHT 279 -#define EL_BELT2_SWITCH_L 280 -#define EL_BELT2_SWITCH_M 281 -#define EL_BELT2_SWITCH_R 282 +#define EL_BELT2_SWITCH_LEFT 280 +#define EL_BELT2_SWITCH_MIDDLE 281 +#define EL_BELT2_SWITCH_RIGHT 282 #define EL_BELT3_LEFT 283 #define EL_BELT3_MIDDLE 284 #define EL_BELT3_RIGHT 285 -#define EL_BELT3_SWITCH_L 286 -#define EL_BELT3_SWITCH_M 287 -#define EL_BELT3_SWITCH_R 288 +#define EL_BELT3_SWITCH_LEFT 286 +#define EL_BELT3_SWITCH_MIDDLE 287 +#define EL_BELT3_SWITCH_RIGHT 288 #define EL_BELT4_LEFT 289 #define EL_BELT4_MIDDLE 290 #define EL_BELT4_RIGHT 291 -#define EL_BELT4_SWITCH_L 292 -#define EL_BELT4_SWITCH_M 293 -#define EL_BELT4_SWITCH_R 294 +#define EL_BELT4_SWITCH_LEFT 292 +#define EL_BELT4_SWITCH_MIDDLE 293 +#define EL_BELT4_SWITCH_RIGHT 294 #define EL_LANDMINE 295 #define EL_ENVELOPE 296 #define EL_LIGHT_SWITCH_OFF 297 @@ -909,8 +909,10 @@ extern char *element_info[]; #define EL_SAND_INVISIBLE 316 #define EL_DX_UNKNOWN_15 317 #define EL_DX_UNKNOWN_42 318 -#define EL_DX_UNKNOWN_229 319 -#define EL_DX_UNKNOWN_233 320 + +#define EL_UNUSED_319 319 +#define EL_UNUSED_320 320 + #define EL_FORCE_FIELD_ACTIVE 321 /* "real" (and therefore drawable) runtime elements */ @@ -941,9 +943,10 @@ extern char *element_info[]; #define EL_BLURB_LEFT 603 #define EL_BLURB_RIGHT 604 #define EL_AMOEBING 605 -#define EL_MAUERND 606 -#define EL_BURNING 607 -#define EL_PLAYER_IS_LEAVING 608 +#define EL_DEAMOEBING 606 +#define EL_MAUERND 607 +#define EL_BURNING 608 +#define EL_PLAYER_IS_LEAVING 609 /* game graphics: ** 0 - 255: graphics from "RocksScreen" @@ -1015,25 +1018,25 @@ extern char *element_info[]; #define GFX_DYNAMIT_AUS 48 #define GFX_DYNAMIT 49 #define GFX_FLIEGER 56 -#define GFX_FLIEGER_R 56 -#define GFX_FLIEGER_O 57 -#define GFX_FLIEGER_L 58 -#define GFX_FLIEGER_U 59 +#define GFX_FLIEGER_RIGHT 56 +#define GFX_FLIEGER_UP 57 +#define GFX_FLIEGER_LEFT 58 +#define GFX_FLIEGER_DOWN 59 /* Zeile 4 (64) */ #define GFX_EXPLOSION 64 #define GFX_KAEFER 72 -#define GFX_KAEFER_R 72 -#define GFX_KAEFER_O 73 -#define GFX_KAEFER_L 74 -#define GFX_KAEFER_U 75 +#define GFX_KAEFER_RIGHT 72 +#define GFX_KAEFER_UP 73 +#define GFX_KAEFER_LEFT 74 +#define GFX_KAEFER_DOWN 75 /* Zeile 5 (80) */ #define GFX_MAMPFER 80 #define GFX_ROBOT 84 #define GFX_PACMAN 88 -#define GFX_PACMAN_R 88 -#define GFX_PACMAN_O 89 -#define GFX_PACMAN_L 90 -#define GFX_PACMAN_U 91 +#define GFX_PACMAN_RIGHT 88 +#define GFX_PACMAN_UP 89 +#define GFX_PACMAN_LEFT 90 +#define GFX_PACMAN_DOWN 91 /* Zeile 6 (96) */ #define GFX_ABLENK 96 #define GFX_ABLENK_EIN GFX_ABLENK @@ -1078,7 +1081,7 @@ extern char *element_info[]; #define GFX_KUGEL_GRAU 143 /* Zeile 9 (144) */ #define GFX_PINGUIN 144 -#define GFX_MAULWURF 145 +#define GFX_MOLE 145 #define GFX_SCHWEIN 146 #define GFX_DRACHE 147 #define GFX_MAUER_XY 148 @@ -1112,20 +1115,20 @@ extern char *element_info[]; #define GFX_DYNABOMB_NR 188 #define GFX_DYNABOMB_SZ 191 /* Zeile 12 (192) */ -#define GFX_PFEIL_L 192 -#define GFX_PFEIL_R 193 -#define GFX_PFEIL_O 194 -#define GFX_PFEIL_U 195 +#define GFX_PFEIL_LEFT 192 +#define GFX_PFEIL_RIGHT 193 +#define GFX_PFEIL_UP 194 +#define GFX_PFEIL_DOWN 195 #define GFX_BUTTERFLY 196 #define GFX_FIREFLY 198 -#define GFX_BUTTERFLY_R 200 -#define GFX_BUTTERFLY_O 201 -#define GFX_BUTTERFLY_L 202 -#define GFX_BUTTERFLY_U 203 -#define GFX_FIREFLY_R 204 -#define GFX_FIREFLY_O 205 -#define GFX_FIREFLY_L 206 -#define GFX_FIREFLY_U 207 +#define GFX_BUTTERFLY_RIGHT 200 +#define GFX_BUTTERFLY_UP 201 +#define GFX_BUTTERFLY_LEFT 202 +#define GFX_BUTTERFLY_DOWN 203 +#define GFX_FIREFLY_RIGHT 204 +#define GFX_FIREFLY_UP 205 +#define GFX_FIREFLY_LEFT 206 +#define GFX_FIREFLY_DOWN 207 /* only available as size MINI_TILE */ #define GFX_VSTEEL_UPPER_LEFT 208 @@ -1182,10 +1185,10 @@ extern char *element_info[]; #define GFX_DRACHE_UP (GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE +12) #define GFX_DRACHE_LEFT (GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE + 8) #define GFX_DRACHE_RIGHT (GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE +12) -#define GFX_MAULWURF_DOWN (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 8) -#define GFX_MAULWURF_UP (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE +12) -#define GFX_MAULWURF_LEFT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 8) -#define GFX_MAULWURF_RIGHT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE +12) +#define GFX_MOLE_DOWN (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 8) +#define GFX_MOLE_UP (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE +12) +#define GFX_MOLE_LEFT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 8) +#define GFX_MOLE_RIGHT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE +12) #define GFX_PINGUIN_DOWN (GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE + 8) #define GFX_PINGUIN_UP (GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE +12) #define GFX_PINGUIN_LEFT (GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 8) @@ -1302,18 +1305,18 @@ extern char *element_info[]; #define GFX_BELT4_MIDDLE (GFX_START_ROCKSDC + 9 * DC_PER_LINE + 0) #define GFX_BELT4_LEFT (GFX_START_ROCKSDC + 10 * DC_PER_LINE + 0) #define GFX_BELT4_RIGHT (GFX_START_ROCKSDC + 11 * DC_PER_LINE + 0) -#define GFX_BELT1_SWITCH_L (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 0) -#define GFX_BELT2_SWITCH_L (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 1) -#define GFX_BELT3_SWITCH_L (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 2) -#define GFX_BELT4_SWITCH_L (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 3) -#define GFX_BELT1_SWITCH_M (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 0) -#define GFX_BELT2_SWITCH_M (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 1) -#define GFX_BELT3_SWITCH_M (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 2) -#define GFX_BELT4_SWITCH_M (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 3) -#define GFX_BELT1_SWITCH_R (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 0) -#define GFX_BELT2_SWITCH_R (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 1) -#define GFX_BELT3_SWITCH_R (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 2) -#define GFX_BELT4_SWITCH_R (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 3) +#define GFX_BELT1_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 0) +#define GFX_BELT2_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 1) +#define GFX_BELT3_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 2) +#define GFX_BELT4_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 3) +#define GFX_BELT1_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 0) +#define GFX_BELT2_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 1) +#define GFX_BELT3_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 2) +#define GFX_BELT4_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 3) +#define GFX_BELT1_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 0) +#define GFX_BELT2_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 1) +#define GFX_BELT3_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 2) +#define GFX_BELT4_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 3) #define GFX_SWITCHGATE_OPEN (GFX_START_ROCKSDC + 15 * DC_PER_LINE + 4) #define GFX_SWITCHGATE_CLOSED (GFX_START_ROCKSDC + 15 * DC_PER_LINE + 0) @@ -1384,14 +1387,8 @@ extern char *element_info[]; #define GFX_SIGN_EXIT GFX_CHAR_FRAGE #define GFX_SIGN_YINYANG GFX_CHAR_FRAGE #define GFX_SIGN_OTHER GFX_CHAR_FRAGE -#define GFX_MOLE_LEFT GFX_CHAR_FRAGE -#define GFX_MOLE_RIGHT GFX_CHAR_FRAGE -#define GFX_MOLE_UP GFX_CHAR_FRAGE -#define GFX_MOLE_DOWN GFX_CHAR_FRAGE #define GFX_DX_UNKNOWN_15 GFX_CHAR_FRAGE #define GFX_DX_UNKNOWN_42 GFX_CHAR_FRAGE -#define GFX_DX_UNKNOWN_229 GFX_CHAR_FRAGE -#define GFX_DX_UNKNOWN_233 GFX_CHAR_FRAGE /* the names of the sounds */ #define SND_ALCHEMY 0