X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=d1ca675ade4ee756a308854482c68e99617f5355;hp=a5f90d7a2173aff463c1d147306987df3f85d2e6;hb=310781167f731177d6d46b15093dc32606eeac4e;hpb=40aa8a64f516da6baf703b44d141b37c291553df diff --git a/src/main.h b/src/main.h index a5f90d7a..d1ca675a 100644 --- a/src/main.h +++ b/src/main.h @@ -1592,24 +1592,24 @@ #define EL_MM_WALL_END EL_MM_WALL_63 #define EL_MM_WOODEN_BLOCK (EL_MM_START + 96) #define EL_MM_GRAY_BALL (EL_MM_START + 97) -#define EL_MM_BEAMER_START (EL_MM_START + 98) -#define EL_MM_BEAMER_1 (EL_MM_BEAMER_START + 0) -#define EL_MM_BEAMER_2 (EL_MM_BEAMER_START + 1) -#define EL_MM_BEAMER_3 (EL_MM_BEAMER_START + 2) -#define EL_MM_BEAMER_4 (EL_MM_BEAMER_START + 3) -#define EL_MM_BEAMER_5 (EL_MM_BEAMER_START + 4) -#define EL_MM_BEAMER_6 (EL_MM_BEAMER_START + 5) -#define EL_MM_BEAMER_7 (EL_MM_BEAMER_START + 6) -#define EL_MM_BEAMER_8 (EL_MM_BEAMER_START + 7) -#define EL_MM_BEAMER_9 (EL_MM_BEAMER_START + 8) -#define EL_MM_BEAMER_10 (EL_MM_BEAMER_START + 9) -#define EL_MM_BEAMER_11 (EL_MM_BEAMER_START + 10) -#define EL_MM_BEAMER_12 (EL_MM_BEAMER_START + 11) -#define EL_MM_BEAMER_13 (EL_MM_BEAMER_START + 12) -#define EL_MM_BEAMER_14 (EL_MM_BEAMER_START + 13) -#define EL_MM_BEAMER_15 (EL_MM_BEAMER_START + 14) -#define EL_MM_BEAMER_16 (EL_MM_BEAMER_START + 15) -#define EL_MM_BEAMER_END EL_MM_BEAMER_15 +#define EL_MM_TELEPORTER_START (EL_MM_START + 98) +#define EL_MM_TELEPORTER_1 (EL_MM_TELEPORTER_START + 0) +#define EL_MM_TELEPORTER_2 (EL_MM_TELEPORTER_START + 1) +#define EL_MM_TELEPORTER_3 (EL_MM_TELEPORTER_START + 2) +#define EL_MM_TELEPORTER_4 (EL_MM_TELEPORTER_START + 3) +#define EL_MM_TELEPORTER_5 (EL_MM_TELEPORTER_START + 4) +#define EL_MM_TELEPORTER_6 (EL_MM_TELEPORTER_START + 5) +#define EL_MM_TELEPORTER_7 (EL_MM_TELEPORTER_START + 6) +#define EL_MM_TELEPORTER_8 (EL_MM_TELEPORTER_START + 7) +#define EL_MM_TELEPORTER_9 (EL_MM_TELEPORTER_START + 8) +#define EL_MM_TELEPORTER_10 (EL_MM_TELEPORTER_START + 9) +#define EL_MM_TELEPORTER_11 (EL_MM_TELEPORTER_START + 10) +#define EL_MM_TELEPORTER_12 (EL_MM_TELEPORTER_START + 11) +#define EL_MM_TELEPORTER_13 (EL_MM_TELEPORTER_START + 12) +#define EL_MM_TELEPORTER_14 (EL_MM_TELEPORTER_START + 13) +#define EL_MM_TELEPORTER_15 (EL_MM_TELEPORTER_START + 14) +#define EL_MM_TELEPORTER_16 (EL_MM_TELEPORTER_START + 15) +#define EL_MM_TELEPORTER_END EL_MM_TELEPORTER_15 #define EL_MM_FUSE_ACTIVE (EL_MM_START + 114) #define EL_MM_PACMAN_START (EL_MM_START + 115) #define EL_MM_PACMAN_RIGHT (EL_MM_PACMAN_START + 0) @@ -1799,78 +1799,78 @@ #define EL_DF_END (EL_DF_START2 + 355) -#define EL_MM_BEAMER_RED_START (EL_DF_START2 + 356) -#define EL_MM_BEAMER_RED_1 (EL_MM_BEAMER_RED_START + 0) -#define EL_MM_BEAMER_RED_2 (EL_MM_BEAMER_RED_START + 1) -#define EL_MM_BEAMER_RED_3 (EL_MM_BEAMER_RED_START + 2) -#define EL_MM_BEAMER_RED_4 (EL_MM_BEAMER_RED_START + 3) -#define EL_MM_BEAMER_RED_5 (EL_MM_BEAMER_RED_START + 4) -#define EL_MM_BEAMER_RED_6 (EL_MM_BEAMER_RED_START + 5) -#define EL_MM_BEAMER_RED_7 (EL_MM_BEAMER_RED_START + 6) -#define EL_MM_BEAMER_RED_8 (EL_MM_BEAMER_RED_START + 7) -#define EL_MM_BEAMER_RED_9 (EL_MM_BEAMER_RED_START + 8) -#define EL_MM_BEAMER_RED_10 (EL_MM_BEAMER_RED_START + 9) -#define EL_MM_BEAMER_RED_11 (EL_MM_BEAMER_RED_START + 10) -#define EL_MM_BEAMER_RED_12 (EL_MM_BEAMER_RED_START + 11) -#define EL_MM_BEAMER_RED_13 (EL_MM_BEAMER_RED_START + 12) -#define EL_MM_BEAMER_RED_14 (EL_MM_BEAMER_RED_START + 13) -#define EL_MM_BEAMER_RED_15 (EL_MM_BEAMER_RED_START + 14) -#define EL_MM_BEAMER_RED_16 (EL_MM_BEAMER_RED_START + 15) -#define EL_MM_BEAMER_RED_END EL_MM_BEAMER_RED_16 -#define EL_MM_BEAMER_YELLOW_START (EL_DF_START2 + 372) -#define EL_MM_BEAMER_YELLOW_1 (EL_MM_BEAMER_YELLOW_START + 0) -#define EL_MM_BEAMER_YELLOW_2 (EL_MM_BEAMER_YELLOW_START + 1) -#define EL_MM_BEAMER_YELLOW_3 (EL_MM_BEAMER_YELLOW_START + 2) -#define EL_MM_BEAMER_YELLOW_4 (EL_MM_BEAMER_YELLOW_START + 3) -#define EL_MM_BEAMER_YELLOW_5 (EL_MM_BEAMER_YELLOW_START + 4) -#define EL_MM_BEAMER_YELLOW_6 (EL_MM_BEAMER_YELLOW_START + 5) -#define EL_MM_BEAMER_YELLOW_7 (EL_MM_BEAMER_YELLOW_START + 6) -#define EL_MM_BEAMER_YELLOW_8 (EL_MM_BEAMER_YELLOW_START + 7) -#define EL_MM_BEAMER_YELLOW_9 (EL_MM_BEAMER_YELLOW_START + 8) -#define EL_MM_BEAMER_YELLOW_10 (EL_MM_BEAMER_YELLOW_START + 9) -#define EL_MM_BEAMER_YELLOW_11 (EL_MM_BEAMER_YELLOW_START + 10) -#define EL_MM_BEAMER_YELLOW_12 (EL_MM_BEAMER_YELLOW_START + 11) -#define EL_MM_BEAMER_YELLOW_13 (EL_MM_BEAMER_YELLOW_START + 12) -#define EL_MM_BEAMER_YELLOW_14 (EL_MM_BEAMER_YELLOW_START + 13) -#define EL_MM_BEAMER_YELLOW_15 (EL_MM_BEAMER_YELLOW_START + 14) -#define EL_MM_BEAMER_YELLOW_16 (EL_MM_BEAMER_YELLOW_START + 15) -#define EL_MM_BEAMER_YELLOW_END EL_MM_BEAMER_YELLOW_16 -#define EL_MM_BEAMER_GREEN_START (EL_DF_START2 + 388) -#define EL_MM_BEAMER_GREEN_1 (EL_MM_BEAMER_GREEN_START + 0) -#define EL_MM_BEAMER_GREEN_2 (EL_MM_BEAMER_GREEN_START + 1) -#define EL_MM_BEAMER_GREEN_3 (EL_MM_BEAMER_GREEN_START + 2) -#define EL_MM_BEAMER_GREEN_4 (EL_MM_BEAMER_GREEN_START + 3) -#define EL_MM_BEAMER_GREEN_5 (EL_MM_BEAMER_GREEN_START + 4) -#define EL_MM_BEAMER_GREEN_6 (EL_MM_BEAMER_GREEN_START + 5) -#define EL_MM_BEAMER_GREEN_7 (EL_MM_BEAMER_GREEN_START + 6) -#define EL_MM_BEAMER_GREEN_8 (EL_MM_BEAMER_GREEN_START + 7) -#define EL_MM_BEAMER_GREEN_9 (EL_MM_BEAMER_GREEN_START + 8) -#define EL_MM_BEAMER_GREEN_10 (EL_MM_BEAMER_GREEN_START + 9) -#define EL_MM_BEAMER_GREEN_11 (EL_MM_BEAMER_GREEN_START + 10) -#define EL_MM_BEAMER_GREEN_12 (EL_MM_BEAMER_GREEN_START + 11) -#define EL_MM_BEAMER_GREEN_13 (EL_MM_BEAMER_GREEN_START + 12) -#define EL_MM_BEAMER_GREEN_14 (EL_MM_BEAMER_GREEN_START + 13) -#define EL_MM_BEAMER_GREEN_15 (EL_MM_BEAMER_GREEN_START + 14) -#define EL_MM_BEAMER_GREEN_16 (EL_MM_BEAMER_GREEN_START + 15) -#define EL_MM_BEAMER_GREEN_END EL_MM_BEAMER_GREEN_16 -#define EL_MM_BEAMER_BLUE_START (EL_DF_START2 + 404) -#define EL_MM_BEAMER_BLUE_1 (EL_MM_BEAMER_BLUE_START + 0) -#define EL_MM_BEAMER_BLUE_2 (EL_MM_BEAMER_BLUE_START + 1) -#define EL_MM_BEAMER_BLUE_3 (EL_MM_BEAMER_BLUE_START + 2) -#define EL_MM_BEAMER_BLUE_4 (EL_MM_BEAMER_BLUE_START + 3) -#define EL_MM_BEAMER_BLUE_5 (EL_MM_BEAMER_BLUE_START + 4) -#define EL_MM_BEAMER_BLUE_6 (EL_MM_BEAMER_BLUE_START + 5) -#define EL_MM_BEAMER_BLUE_7 (EL_MM_BEAMER_BLUE_START + 6) -#define EL_MM_BEAMER_BLUE_8 (EL_MM_BEAMER_BLUE_START + 7) -#define EL_MM_BEAMER_BLUE_9 (EL_MM_BEAMER_BLUE_START + 8) -#define EL_MM_BEAMER_BLUE_10 (EL_MM_BEAMER_BLUE_START + 9) -#define EL_MM_BEAMER_BLUE_11 (EL_MM_BEAMER_BLUE_START + 10) -#define EL_MM_BEAMER_BLUE_12 (EL_MM_BEAMER_BLUE_START + 11) -#define EL_MM_BEAMER_BLUE_13 (EL_MM_BEAMER_BLUE_START + 12) -#define EL_MM_BEAMER_BLUE_14 (EL_MM_BEAMER_BLUE_START + 13) -#define EL_MM_BEAMER_BLUE_15 (EL_MM_BEAMER_BLUE_START + 14) -#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_TELEPORTER_RED_START (EL_DF_START2 + 356) +#define EL_MM_TELEPORTER_RED_1 (EL_MM_TELEPORTER_RED_START + 0) +#define EL_MM_TELEPORTER_RED_2 (EL_MM_TELEPORTER_RED_START + 1) +#define EL_MM_TELEPORTER_RED_3 (EL_MM_TELEPORTER_RED_START + 2) +#define EL_MM_TELEPORTER_RED_4 (EL_MM_TELEPORTER_RED_START + 3) +#define EL_MM_TELEPORTER_RED_5 (EL_MM_TELEPORTER_RED_START + 4) +#define EL_MM_TELEPORTER_RED_6 (EL_MM_TELEPORTER_RED_START + 5) +#define EL_MM_TELEPORTER_RED_7 (EL_MM_TELEPORTER_RED_START + 6) +#define EL_MM_TELEPORTER_RED_8 (EL_MM_TELEPORTER_RED_START + 7) +#define EL_MM_TELEPORTER_RED_9 (EL_MM_TELEPORTER_RED_START + 8) +#define EL_MM_TELEPORTER_RED_10 (EL_MM_TELEPORTER_RED_START + 9) +#define EL_MM_TELEPORTER_RED_11 (EL_MM_TELEPORTER_RED_START + 10) +#define EL_MM_TELEPORTER_RED_12 (EL_MM_TELEPORTER_RED_START + 11) +#define EL_MM_TELEPORTER_RED_13 (EL_MM_TELEPORTER_RED_START + 12) +#define EL_MM_TELEPORTER_RED_14 (EL_MM_TELEPORTER_RED_START + 13) +#define EL_MM_TELEPORTER_RED_15 (EL_MM_TELEPORTER_RED_START + 14) +#define EL_MM_TELEPORTER_RED_16 (EL_MM_TELEPORTER_RED_START + 15) +#define EL_MM_TELEPORTER_RED_END EL_MM_TELEPORTER_RED_16 +#define EL_MM_TELEPORTER_YELLOW_START (EL_DF_START2 + 372) +#define EL_MM_TELEPORTER_YELLOW_1 (EL_MM_TELEPORTER_YELLOW_START + 0) +#define EL_MM_TELEPORTER_YELLOW_2 (EL_MM_TELEPORTER_YELLOW_START + 1) +#define EL_MM_TELEPORTER_YELLOW_3 (EL_MM_TELEPORTER_YELLOW_START + 2) +#define EL_MM_TELEPORTER_YELLOW_4 (EL_MM_TELEPORTER_YELLOW_START + 3) +#define EL_MM_TELEPORTER_YELLOW_5 (EL_MM_TELEPORTER_YELLOW_START + 4) +#define EL_MM_TELEPORTER_YELLOW_6 (EL_MM_TELEPORTER_YELLOW_START + 5) +#define EL_MM_TELEPORTER_YELLOW_7 (EL_MM_TELEPORTER_YELLOW_START + 6) +#define EL_MM_TELEPORTER_YELLOW_8 (EL_MM_TELEPORTER_YELLOW_START + 7) +#define EL_MM_TELEPORTER_YELLOW_9 (EL_MM_TELEPORTER_YELLOW_START + 8) +#define EL_MM_TELEPORTER_YELLOW_10 (EL_MM_TELEPORTER_YELLOW_START + 9) +#define EL_MM_TELEPORTER_YELLOW_11 (EL_MM_TELEPORTER_YELLOW_START + 10) +#define EL_MM_TELEPORTER_YELLOW_12 (EL_MM_TELEPORTER_YELLOW_START + 11) +#define EL_MM_TELEPORTER_YELLOW_13 (EL_MM_TELEPORTER_YELLOW_START + 12) +#define EL_MM_TELEPORTER_YELLOW_14 (EL_MM_TELEPORTER_YELLOW_START + 13) +#define EL_MM_TELEPORTER_YELLOW_15 (EL_MM_TELEPORTER_YELLOW_START + 14) +#define EL_MM_TELEPORTER_YELLOW_16 (EL_MM_TELEPORTER_YELLOW_START + 15) +#define EL_MM_TELEPORTER_YELLOW_END EL_MM_TELEPORTER_YELLOW_16 +#define EL_MM_TELEPORTER_GREEN_START (EL_DF_START2 + 388) +#define EL_MM_TELEPORTER_GREEN_1 (EL_MM_TELEPORTER_GREEN_START + 0) +#define EL_MM_TELEPORTER_GREEN_2 (EL_MM_TELEPORTER_GREEN_START + 1) +#define EL_MM_TELEPORTER_GREEN_3 (EL_MM_TELEPORTER_GREEN_START + 2) +#define EL_MM_TELEPORTER_GREEN_4 (EL_MM_TELEPORTER_GREEN_START + 3) +#define EL_MM_TELEPORTER_GREEN_5 (EL_MM_TELEPORTER_GREEN_START + 4) +#define EL_MM_TELEPORTER_GREEN_6 (EL_MM_TELEPORTER_GREEN_START + 5) +#define EL_MM_TELEPORTER_GREEN_7 (EL_MM_TELEPORTER_GREEN_START + 6) +#define EL_MM_TELEPORTER_GREEN_8 (EL_MM_TELEPORTER_GREEN_START + 7) +#define EL_MM_TELEPORTER_GREEN_9 (EL_MM_TELEPORTER_GREEN_START + 8) +#define EL_MM_TELEPORTER_GREEN_10 (EL_MM_TELEPORTER_GREEN_START + 9) +#define EL_MM_TELEPORTER_GREEN_11 (EL_MM_TELEPORTER_GREEN_START + 10) +#define EL_MM_TELEPORTER_GREEN_12 (EL_MM_TELEPORTER_GREEN_START + 11) +#define EL_MM_TELEPORTER_GREEN_13 (EL_MM_TELEPORTER_GREEN_START + 12) +#define EL_MM_TELEPORTER_GREEN_14 (EL_MM_TELEPORTER_GREEN_START + 13) +#define EL_MM_TELEPORTER_GREEN_15 (EL_MM_TELEPORTER_GREEN_START + 14) +#define EL_MM_TELEPORTER_GREEN_16 (EL_MM_TELEPORTER_GREEN_START + 15) +#define EL_MM_TELEPORTER_GREEN_END EL_MM_TELEPORTER_GREEN_16 +#define EL_MM_TELEPORTER_BLUE_START (EL_DF_START2 + 404) +#define EL_MM_TELEPORTER_BLUE_1 (EL_MM_TELEPORTER_BLUE_START + 0) +#define EL_MM_TELEPORTER_BLUE_2 (EL_MM_TELEPORTER_BLUE_START + 1) +#define EL_MM_TELEPORTER_BLUE_3 (EL_MM_TELEPORTER_BLUE_START + 2) +#define EL_MM_TELEPORTER_BLUE_4 (EL_MM_TELEPORTER_BLUE_START + 3) +#define EL_MM_TELEPORTER_BLUE_5 (EL_MM_TELEPORTER_BLUE_START + 4) +#define EL_MM_TELEPORTER_BLUE_6 (EL_MM_TELEPORTER_BLUE_START + 5) +#define EL_MM_TELEPORTER_BLUE_7 (EL_MM_TELEPORTER_BLUE_START + 6) +#define EL_MM_TELEPORTER_BLUE_8 (EL_MM_TELEPORTER_BLUE_START + 7) +#define EL_MM_TELEPORTER_BLUE_9 (EL_MM_TELEPORTER_BLUE_START + 8) +#define EL_MM_TELEPORTER_BLUE_10 (EL_MM_TELEPORTER_BLUE_START + 9) +#define EL_MM_TELEPORTER_BLUE_11 (EL_MM_TELEPORTER_BLUE_START + 10) +#define EL_MM_TELEPORTER_BLUE_12 (EL_MM_TELEPORTER_BLUE_START + 11) +#define EL_MM_TELEPORTER_BLUE_13 (EL_MM_TELEPORTER_BLUE_START + 12) +#define EL_MM_TELEPORTER_BLUE_14 (EL_MM_TELEPORTER_BLUE_START + 13) +#define EL_MM_TELEPORTER_BLUE_15 (EL_MM_TELEPORTER_BLUE_START + 14) +#define EL_MM_TELEPORTER_BLUE_16 (EL_MM_TELEPORTER_BLUE_START + 15) +#define EL_MM_TELEPORTER_BLUE_END EL_MM_TELEPORTER_BLUE_16 #define EL_MM_MCDUFFIN 1204 #define EL_MM_PACMAN 1205