X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=65e3a7ee99166829fa151f200d9c9213f3051e98;hb=73dd81c85be90e466493bcc6f45c402d29bc7f20;hp=9a3343b8c10cd8f826940c8be6c283355ac9166f;hpb=7d171d862abdecced79f60535b49a686386cefe1;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 9a3343b8..65e3a7ee 100644 --- a/src/main.h +++ b/src/main.h @@ -963,103 +963,44 @@ #define EL_SP_GRAVITY_OFF_PORT_LEFT 665 #define EL_SP_GRAVITY_OFF_PORT_UP 666 -#if 1 - -#define NUM_FILE_ELEMENTS 667 - -/* the following EMC style elements are currently not implemented in R'n'D */ -#define EL_BALLOON_SWITCH_NONE EL_UNKNOWN -#define EL_EMC_LEVEL_BORDER EL_UNKNOWN -#define EL_EMC_ANDROID EL_UNKNOWN -#define EL_EMC_ANDROID_RIGHT EL_UNKNOWN -#define EL_EMC_ANDROID_UP EL_UNKNOWN -#define EL_EMC_ANDROID_LEFT EL_UNKNOWN -#define EL_EMC_ANDROID_DOWN EL_UNKNOWN -#define EL_EMC_ANDROID_LEFT_UP EL_UNKNOWN -#define EL_EMC_ANDROID_LEFT_DOWN EL_UNKNOWN -#define EL_EMC_ANDROID_RIGHT_UP EL_UNKNOWN -#define EL_EMC_ANDROID_RIGHT_DOWN EL_UNKNOWN -#define EL_EMC_GRASS EL_UNKNOWN -#define EL_EMC_GENERATOR_BALL EL_UNKNOWN -#define EL_EMC_GROW EL_UNKNOWN -#define EL_EMC_GATE_1 EL_UNKNOWN -#define EL_EMC_GATE_2 EL_UNKNOWN -#define EL_EMC_GATE_3 EL_UNKNOWN -#define EL_EMC_GATE_4 EL_UNKNOWN -#define EL_EMC_GATE_5 EL_UNKNOWN -#define EL_EMC_GATE_6 EL_UNKNOWN -#define EL_EMC_GATE_7 EL_UNKNOWN -#define EL_EMC_GATE_8 EL_UNKNOWN -#define EL_EMC_GATE_1_GRAY EL_UNKNOWN -#define EL_EMC_GATE_2_GRAY EL_UNKNOWN -#define EL_EMC_GATE_3_GRAY EL_UNKNOWN -#define EL_EMC_GATE_4_GRAY EL_UNKNOWN -#define EL_EMC_GATE_5_GRAY EL_UNKNOWN -#define EL_EMC_GATE_6_GRAY EL_UNKNOWN -#define EL_EMC_GATE_7_GRAY EL_UNKNOWN -#define EL_EMC_GATE_8_GRAY EL_UNKNOWN -#define EL_EMC_KEY_1 EL_UNKNOWN -#define EL_EMC_KEY_2 EL_UNKNOWN -#define EL_EMC_KEY_3 EL_UNKNOWN -#define EL_EMC_KEY_4 EL_UNKNOWN -#define EL_EMC_KEY_5 EL_UNKNOWN -#define EL_EMC_KEY_6 EL_UNKNOWN -#define EL_EMC_KEY_7 EL_UNKNOWN -#define EL_EMC_KEY_8 EL_UNKNOWN -#define EL_EMC_BUMPER EL_UNKNOWN -#define EL_EMC_PLANT EL_UNKNOWN -#define EL_EMC_LENSES EL_UNKNOWN -#define EL_EMC_MAGNIFY EL_UNKNOWN - -#else /* the following EMC style elements are currently not implemented in R'n'D */ #define EL_BALLOON_SWITCH_NONE 667 #define EL_EMC_LEVEL_BORDER 668 #define EL_EMC_ANDROID 669 -#define EL_EMC_ANDROID_RIGHT 670 -#define EL_EMC_ANDROID_UP 671 -#define EL_EMC_ANDROID_LEFT 672 -#define EL_EMC_ANDROID_DOWN 673 -#define EL_EMC_ANDROID_LEFT_UP 674 -#define EL_EMC_ANDROID_LEFT_DOWN 675 -#define EL_EMC_ANDROID_RIGHT_UP 676 -#define EL_EMC_ANDROID_RIGHT_DOWN 677 -#define EL_EMC_GRASS 678 -#define EL_EMC_GENERATOR_BALL 679 -#define EL_EMC_GROW 680 -#define EL_EMC_GATE_1 681 -#define EL_EMC_GATE_2 682 -#define EL_EMC_GATE_3 683 -#define EL_EMC_GATE_4 684 -#define EL_EMC_GATE_5 685 -#define EL_EMC_GATE_6 686 -#define EL_EMC_GATE_7 687 -#define EL_EMC_GATE_8 688 -#define EL_EMC_GATE_1_GRAY 689 -#define EL_EMC_GATE_2_GRAY 690 -#define EL_EMC_GATE_3_GRAY 691 -#define EL_EMC_GATE_4_GRAY 692 -#define EL_EMC_GATE_5_GRAY 693 -#define EL_EMC_GATE_6_GRAY 694 -#define EL_EMC_GATE_7_GRAY 695 -#define EL_EMC_GATE_8_GRAY 696 -#define EL_EMC_KEY_1 697 -#define EL_EMC_KEY_2 698 -#define EL_EMC_KEY_3 699 -#define EL_EMC_KEY_4 700 -#define EL_EMC_KEY_5 701 -#define EL_EMC_KEY_6 702 -#define EL_EMC_KEY_7 703 -#define EL_EMC_KEY_8 704 -#define EL_EMC_BUMPER 705 -#define EL_EMC_PLANT 706 -#define EL_EMC_LENSES 707 -#define EL_EMC_MAGNIFY 708 - -#define NUM_FILE_ELEMENTS 709 - -#endif +#define EL_EMC_GRASS 670 +#define EL_EMC_MAGIC_BALL 671 +#define EL_EMC_MAGIC_BALL_SWITCH 672 +#define EL_EMC_GATE_5 673 +#define EL_EMC_GATE_6 674 +#define EL_EMC_GATE_7 675 +#define EL_EMC_GATE_8 676 +#define EL_EMC_GATE_5_GRAY 677 +#define EL_EMC_GATE_6_GRAY 678 +#define EL_EMC_GATE_7_GRAY 679 +#define EL_EMC_GATE_8_GRAY 680 +#define EL_EMC_KEY_5 681 +#define EL_EMC_KEY_6 682 +#define EL_EMC_KEY_7 683 +#define EL_EMC_KEY_8 684 +#define EL_EMC_BUMPER 685 +#define EL_EMC_PLANT 686 +#define EL_EMC_LENSES 687 +#define EL_EMC_MAGNIFIER 688 +#define EL_EMC_WALL_9 689 +#define EL_EMC_WALL_10 690 +#define EL_EMC_WALL_11 691 +#define EL_EMC_WALL_12 692 +#define EL_EMC_WALL_13 693 +#define EL_EMC_WALL_14 694 +#define EL_EMC_WALL_15 695 +#define EL_EMC_WALL_16 696 +#define EL_EMC_WALL_SLIPPERY_1 697 +#define EL_EMC_WALL_SLIPPERY_2 698 +#define EL_EMC_WALL_SLIPPERY_3 699 +#define EL_EMC_WALL_SLIPPERY_4 700 + +#define NUM_FILE_ELEMENTS 701 /* "real" (and therefore drawable) runtime elements */ @@ -1282,7 +1223,7 @@ #define GFX_ARG_POST_DELAY_FIXED 28 #define GFX_ARG_POST_DELAY_RANDOM 29 #define GFX_ARG_NAME 30 -#define GFX_ARG_SCALE_UP 31 +#define GFX_ARG_SCALE_UP_FACTOR 31 #define NUM_GFX_ARGS 32