From: Holger Schemel Date: Mon, 4 Oct 2004 20:15:05 +0000 (+0200) Subject: rnd-20041004-1-src X-Git-Tag: 3.1.1^2~56 X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=e6c0b4c0114691d197018f878e0150a3f5d8490e rnd-20041004-1-src --- diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 7dd322fc..8762b402 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -2570,72 +2570,72 @@ element_to_graphic[] = IMG_BALLOON_SWITCH_NONE }, { - EL_EMC_ANDROID, -1, -1, FALSE, - IMG_EMC_ANDROID + EL_EM_GATE_5, -1, -1, FALSE, + IMG_EM_GATE_5 }, { - EL_EMC_GRASS, -1, -1, FALSE, - IMG_EMC_GRASS + EL_EM_GATE_5_GRAY, -1, -1, FALSE, + IMG_EM_GATE_5_GRAY }, { - EL_EMC_MAGIC_BALL, -1, -1, FALSE, - IMG_EMC_MAGIC_BALL + EL_EM_GATE_6, -1, -1, FALSE, + IMG_EM_GATE_6 }, { - EL_EMC_MAGIC_BALL_SWITCH, -1, -1, FALSE, - IMG_EMC_MAGIC_BALL_SWITCH + EL_EM_GATE_6_GRAY, -1, -1, FALSE, + IMG_EM_GATE_6_GRAY }, { - EL_EMC_GATE_5, -1, -1, FALSE, - IMG_EMC_GATE_5 + EL_EM_GATE_7, -1, -1, FALSE, + IMG_EM_GATE_7 }, { - EL_EMC_GATE_5_GRAY, -1, -1, FALSE, - IMG_EMC_GATE_5_GRAY + EL_EM_GATE_7_GRAY, -1, -1, FALSE, + IMG_EM_GATE_7_GRAY }, { - EL_EMC_GATE_6, -1, -1, FALSE, - IMG_EMC_GATE_6 + EL_EM_GATE_8, -1, -1, FALSE, + IMG_EM_GATE_8 }, { - EL_EMC_GATE_6_GRAY, -1, -1, FALSE, - IMG_EMC_GATE_6_GRAY + EL_EM_GATE_8_GRAY, -1, -1, FALSE, + IMG_EM_GATE_8_GRAY }, { - EL_EMC_GATE_7, -1, -1, FALSE, - IMG_EMC_GATE_7 + EL_EM_KEY_5, -1, -1, FALSE, + IMG_EM_KEY_5 }, { - EL_EMC_GATE_7_GRAY, -1, -1, FALSE, - IMG_EMC_GATE_7_GRAY + EL_EM_KEY_6, -1, -1, FALSE, + IMG_EM_KEY_6 }, { - EL_EMC_GATE_8, -1, -1, FALSE, - IMG_EMC_GATE_8 + EL_EM_KEY_7, -1, -1, FALSE, + IMG_EM_KEY_7 }, { - EL_EMC_GATE_8_GRAY, -1, -1, FALSE, - IMG_EMC_GATE_8_GRAY + EL_EM_KEY_8, -1, -1, FALSE, + IMG_EM_KEY_8 }, { - EL_EMC_KEY_5, -1, -1, FALSE, - IMG_EMC_KEY_5 + EL_EMC_ANDROID, -1, -1, FALSE, + IMG_EMC_ANDROID }, { - EL_EMC_KEY_6, -1, -1, FALSE, - IMG_EMC_KEY_6 + EL_EMC_GRASS, -1, -1, FALSE, + IMG_EMC_GRASS }, { - EL_EMC_KEY_7, -1, -1, FALSE, - IMG_EMC_KEY_7 + EL_EMC_MAGIC_BALL, -1, -1, FALSE, + IMG_EMC_MAGIC_BALL }, { - EL_EMC_KEY_8, -1, -1, FALSE, - IMG_EMC_KEY_8 + EL_EMC_MAGIC_BALL_SWITCH, -1, -1, FALSE, + IMG_EMC_MAGIC_BALL_SWITCH }, { - EL_EMC_BUMPER, -1, -1, FALSE, - IMG_EMC_BUMPER + EL_EMC_SPRING_BUMPER, -1, -1, FALSE, + IMG_EMC_SPRING_BUMPER }, { EL_EMC_PLANT, -1, -1, FALSE, @@ -2697,6 +2697,10 @@ element_to_graphic[] = EL_EMC_WALL_SLIPPERY_4, -1, -1, FALSE, IMG_EMC_WALL_SLIPPERY_4 }, + { + EL_EMC_DRIPPER, -1, -1, FALSE, + IMG_EMC_DRIPPER + }, { EL_BD_BUTTERFLY_DOWN, -1, -1, FALSE, IMG_BD_BUTTERFLY diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 74ef4084..72366db6 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -3227,10 +3227,74 @@ struct ConfigInfo image_config[] = { "balloon_switch_none.frames", "1" }, { "balloon_switch_none.scale_up_factor", "2" }, + { "em_gate_5", "emc_object.pcx" }, + { "em_gate_5.xpos", "24" }, + { "em_gate_5.ypos", "6" }, + { "em_gate_5.frames", "1" }, + { "em_gate_5.scale_up_factor", "2" }, + { "em_gate_5_gray", "emc_object.pcx" }, + { "em_gate_5_gray.xpos", "25" }, + { "em_gate_5_gray.ypos", "18" }, + { "em_gate_5_gray.frames", "1" }, + { "em_gate_5_gray.scale_up_factor", "2" }, + { "em_gate_6", "emc_object.pcx" }, + { "em_gate_6.xpos", "24" }, + { "em_gate_6.ypos", "7" }, + { "em_gate_6.frames", "1" }, + { "em_gate_6.scale_up_factor", "2" }, + { "em_gate_6_gray", "emc_object.pcx" }, + { "em_gate_6_gray.xpos", "25" }, + { "em_gate_6_gray.ypos", "18" }, + { "em_gate_6_gray.frames", "1" }, + { "em_gate_6_gray.scale_up_factor", "2" }, + { "em_gate_7", "emc_object.pcx" }, + { "em_gate_7.xpos", "24" }, + { "em_gate_7.ypos", "8" }, + { "em_gate_7.frames", "1" }, + { "em_gate_7.scale_up_factor", "2" }, + { "em_gate_7_gray", "emc_object.pcx" }, + { "em_gate_7_gray.xpos", "25" }, + { "em_gate_7_gray.ypos", "18" }, + { "em_gate_7_gray.frames", "1" }, + { "em_gate_7_gray.scale_up_factor", "2" }, + { "em_gate_8", "emc_object.pcx" }, + { "em_gate_8.xpos", "24" }, + { "em_gate_8.ypos", "9" }, + { "em_gate_8.frames", "1" }, + { "em_gate_8.scale_up_factor", "2" }, + { "em_gate_8_gray", "emc_object.pcx" }, + { "em_gate_8_gray.xpos", "25" }, + { "em_gate_8_gray.ypos", "18" }, + { "em_gate_8_gray.frames", "1" }, + { "em_gate_8_gray.scale_up_factor", "2" }, + + { "em_key_5", "emc_object.pcx" }, + { "em_key_5.xpos", "24" }, + { "em_key_5.ypos", "14" }, + { "em_key_5.frames", "1" }, + { "em_key_5.scale_up_factor", "2" }, + { "em_key_6", "emc_object.pcx" }, + { "em_key_6.xpos", "24" }, + { "em_key_6.ypos", "15" }, + { "em_key_6.frames", "1" }, + { "em_key_6.scale_up_factor", "2" }, + { "em_key_7", "emc_object.pcx" }, + { "em_key_7.xpos", "24" }, + { "em_key_7.ypos", "16" }, + { "em_key_7.frames", "1" }, + { "em_key_7.scale_up_factor", "2" }, + { "em_key_8", "emc_object.pcx" }, + { "em_key_8.xpos", "24" }, + { "em_key_8.ypos", "17" }, + { "em_key_8.frames", "1" }, + { "em_key_8.scale_up_factor", "2" }, + { "emc_android", "emc_object.pcx" }, { "emc_android.xpos", "7" }, { "emc_android.ypos", "13" }, - { "emc_android.frames", "1" }, + { "emc_android.frames", "8" }, + { "emc_android.delay", "1" }, + { "emc_android.vertical", "true" }, { "emc_android.scale_up_factor", "2" }, { "emc_grass", "emc_object.pcx" }, @@ -3242,7 +3306,9 @@ struct ConfigInfo image_config[] = { "emc_magic_ball", "emc_object.pcx" }, { "emc_magic_ball.xpos", "22" }, { "emc_magic_ball.ypos", "18" }, - { "emc_magic_ball.frames", "1" }, + { "emc_magic_ball.frames", "16" }, + { "emc_magic_ball.delay", "1" }, + { "emc_magic_ball.vertical", "true" }, { "emc_magic_ball.scale_up_factor", "2" }, { "emc_magic_ball_switch", "emc_object.pcx" }, @@ -3251,73 +3317,11 @@ struct ConfigInfo image_config[] = { "emc_magic_ball_switch.frames", "1" }, { "emc_magic_ball_switch.scale_up_factor", "2" }, - { "emc_gate_5", "emc_object.pcx" }, - { "emc_gate_5.xpos", "24" }, - { "emc_gate_5.ypos", "6" }, - { "emc_gate_5.frames", "1" }, - { "emc_gate_5.scale_up_factor", "2" }, - { "emc_gate_5_gray", "emc_object.pcx" }, - { "emc_gate_5_gray.xpos", "25" }, - { "emc_gate_5_gray.ypos", "18" }, - { "emc_gate_5_gray.frames", "1" }, - { "emc_gate_5_gray.scale_up_factor", "2" }, - { "emc_gate_6", "emc_object.pcx" }, - { "emc_gate_6.xpos", "24" }, - { "emc_gate_6.ypos", "7" }, - { "emc_gate_6.frames", "1" }, - { "emc_gate_6.scale_up_factor", "2" }, - { "emc_gate_6_gray", "emc_object.pcx" }, - { "emc_gate_6_gray.xpos", "25" }, - { "emc_gate_6_gray.ypos", "18" }, - { "emc_gate_6_gray.frames", "1" }, - { "emc_gate_6_gray.scale_up_factor", "2" }, - { "emc_gate_7", "emc_object.pcx" }, - { "emc_gate_7.xpos", "24" }, - { "emc_gate_7.ypos", "8" }, - { "emc_gate_7.frames", "1" }, - { "emc_gate_7.scale_up_factor", "2" }, - { "emc_gate_7_gray", "emc_object.pcx" }, - { "emc_gate_7_gray.xpos", "25" }, - { "emc_gate_7_gray.ypos", "18" }, - { "emc_gate_7_gray.frames", "1" }, - { "emc_gate_7_gray.scale_up_factor", "2" }, - { "emc_gate_8", "emc_object.pcx" }, - { "emc_gate_8.xpos", "24" }, - { "emc_gate_8.ypos", "9" }, - { "emc_gate_8.frames", "1" }, - { "emc_gate_8.scale_up_factor", "2" }, - { "emc_gate_8_gray", "emc_object.pcx" }, - { "emc_gate_8_gray.xpos", "25" }, - { "emc_gate_8_gray.ypos", "18" }, - { "emc_gate_8_gray.frames", "1" }, - { "emc_gate_8_gray.scale_up_factor", "2" }, - - { "emc_key_5", "emc_object.pcx" }, - { "emc_key_5.xpos", "24" }, - { "emc_key_5.ypos", "14" }, - { "emc_key_5.frames", "1" }, - { "emc_key_5.scale_up_factor", "2" }, - { "emc_key_6", "emc_object.pcx" }, - { "emc_key_6.xpos", "24" }, - { "emc_key_6.ypos", "15" }, - { "emc_key_6.frames", "1" }, - { "emc_key_6.scale_up_factor", "2" }, - { "emc_key_7", "emc_object.pcx" }, - { "emc_key_7.xpos", "24" }, - { "emc_key_7.ypos", "16" }, - { "emc_key_7.frames", "1" }, - { "emc_key_7.scale_up_factor", "2" }, - { "emc_key_8", "emc_object.pcx" }, - { "emc_key_8.xpos", "24" }, - { "emc_key_8.ypos", "17" }, - { "emc_key_8.frames", "1" }, - { "emc_key_8.scale_up_factor", "2" }, - - { "emc_bumper", "emc_object.pcx" }, - { "emc_bumper.xpos", "25" }, - { "emc_bumper.ypos", "3" }, - { "emc_bumper.frames", "1" }, - { "emc_bumper.scale_up_factor", "2" }, + { "emc_spring_bumper", "emc_object.pcx" }, + { "emc_spring_bumper.xpos", "25" }, + { "emc_spring_bumper.ypos", "3" }, + { "emc_spring_bumper.frames", "1" }, + { "emc_spring_bumper.scale_up_factor", "2" }, { "emc_plant", "emc_object.pcx" }, { "emc_plant.xpos", "25" }, @@ -3399,6 +3403,12 @@ struct ConfigInfo image_config[] = { "emc_wall_slippery_4.frames", "1" }, { "emc_wall_slippery_4.scale_up_factor", "2" }, + { "emc_dripper", "emc_object.pcx" }, + { "emc_dripper.xpos", "25" }, + { "emc_dripper.ypos", "15" }, + { "emc_dripper.frames", "1" }, + { "emc_dripper.scale_up_factor", "2" }, + #include "conf_chr.c" /* include auto-generated data structure definitions */ #include "conf_cus.c" /* include auto-generated data structure definitions */ #include "conf_grp.c" /* include auto-generated data structure definitions */ diff --git a/src/conf_gfx.h b/src/conf_gfx.h index ecc3f536..afd18515 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -675,23 +675,23 @@ #define IMG_TRIGGER_ELEMENT 654 #define IMG_TRIGGER_PLAYER 655 #define IMG_BALLOON_SWITCH_NONE 656 -#define IMG_EMC_ANDROID 657 -#define IMG_EMC_GRASS 658 -#define IMG_EMC_MAGIC_BALL 659 -#define IMG_EMC_MAGIC_BALL_SWITCH 660 -#define IMG_EMC_GATE_5 661 -#define IMG_EMC_GATE_5_GRAY 662 -#define IMG_EMC_GATE_6 663 -#define IMG_EMC_GATE_6_GRAY 664 -#define IMG_EMC_GATE_7 665 -#define IMG_EMC_GATE_7_GRAY 666 -#define IMG_EMC_GATE_8 667 -#define IMG_EMC_GATE_8_GRAY 668 -#define IMG_EMC_KEY_5 669 -#define IMG_EMC_KEY_6 670 -#define IMG_EMC_KEY_7 671 -#define IMG_EMC_KEY_8 672 -#define IMG_EMC_BUMPER 673 +#define IMG_EM_GATE_5 657 +#define IMG_EM_GATE_5_GRAY 658 +#define IMG_EM_GATE_6 659 +#define IMG_EM_GATE_6_GRAY 660 +#define IMG_EM_GATE_7 661 +#define IMG_EM_GATE_7_GRAY 662 +#define IMG_EM_GATE_8 663 +#define IMG_EM_GATE_8_GRAY 664 +#define IMG_EM_KEY_5 665 +#define IMG_EM_KEY_6 666 +#define IMG_EM_KEY_7 667 +#define IMG_EM_KEY_8 668 +#define IMG_EMC_ANDROID 669 +#define IMG_EMC_GRASS 670 +#define IMG_EMC_MAGIC_BALL 671 +#define IMG_EMC_MAGIC_BALL_SWITCH 672 +#define IMG_EMC_SPRING_BUMPER 673 #define IMG_EMC_PLANT 674 #define IMG_EMC_LENSES 675 #define IMG_EMC_MAGNIFIER 676 @@ -707,755 +707,756 @@ #define IMG_EMC_WALL_SLIPPERY_2 686 #define IMG_EMC_WALL_SLIPPERY_3 687 #define IMG_EMC_WALL_SLIPPERY_4 688 -#define IMG_CHAR_SPACE 689 -#define IMG_CHAR_EXCLAM 690 -#define IMG_CHAR_QUOTEDBL 691 -#define IMG_CHAR_NUMBERSIGN 692 -#define IMG_CHAR_DOLLAR 693 -#define IMG_CHAR_PROCENT 694 -#define IMG_CHAR_AMPERSAND 695 -#define IMG_CHAR_APOSTROPHE 696 -#define IMG_CHAR_PARENLEFT 697 -#define IMG_CHAR_PARENRIGHT 698 -#define IMG_CHAR_ASTERISK 699 -#define IMG_CHAR_PLUS 700 -#define IMG_CHAR_COMMA 701 -#define IMG_CHAR_MINUS 702 -#define IMG_CHAR_PERIOD 703 -#define IMG_CHAR_SLASH 704 -#define IMG_CHAR_0 705 -#define IMG_CHAR_1 706 -#define IMG_CHAR_2 707 -#define IMG_CHAR_3 708 -#define IMG_CHAR_4 709 -#define IMG_CHAR_5 710 -#define IMG_CHAR_6 711 -#define IMG_CHAR_7 712 -#define IMG_CHAR_8 713 -#define IMG_CHAR_9 714 -#define IMG_CHAR_COLON 715 -#define IMG_CHAR_SEMICOLON 716 -#define IMG_CHAR_LESS 717 -#define IMG_CHAR_EQUAL 718 -#define IMG_CHAR_GREATER 719 -#define IMG_CHAR_QUESTION 720 -#define IMG_CHAR_AT 721 -#define IMG_CHAR_A 722 -#define IMG_CHAR_B 723 -#define IMG_CHAR_C 724 -#define IMG_CHAR_D 725 -#define IMG_CHAR_E 726 -#define IMG_CHAR_F 727 -#define IMG_CHAR_G 728 -#define IMG_CHAR_H 729 -#define IMG_CHAR_I 730 -#define IMG_CHAR_J 731 -#define IMG_CHAR_K 732 -#define IMG_CHAR_L 733 -#define IMG_CHAR_M 734 -#define IMG_CHAR_N 735 -#define IMG_CHAR_O 736 -#define IMG_CHAR_P 737 -#define IMG_CHAR_Q 738 -#define IMG_CHAR_R 739 -#define IMG_CHAR_S 740 -#define IMG_CHAR_T 741 -#define IMG_CHAR_U 742 -#define IMG_CHAR_V 743 -#define IMG_CHAR_W 744 -#define IMG_CHAR_X 745 -#define IMG_CHAR_Y 746 -#define IMG_CHAR_Z 747 -#define IMG_CHAR_BRACKETLEFT 748 -#define IMG_CHAR_BACKSLASH 749 -#define IMG_CHAR_BRACKETRIGHT 750 -#define IMG_CHAR_ASCIICIRCUM 751 -#define IMG_CHAR_UNDERSCORE 752 -#define IMG_CHAR_COPYRIGHT 753 -#define IMG_CHAR_AUMLAUT 754 -#define IMG_CHAR_OUMLAUT 755 -#define IMG_CHAR_UUMLAUT 756 -#define IMG_CHAR_DEGREE 757 -#define IMG_CHAR_TRADEMARK 758 -#define IMG_CHAR_CURSOR 759 -#define IMG_CUSTOM_1 760 -#define IMG_CUSTOM_1_EDITOR 761 -#define IMG_CUSTOM_2 762 -#define IMG_CUSTOM_2_EDITOR 763 -#define IMG_CUSTOM_3 764 -#define IMG_CUSTOM_3_EDITOR 765 -#define IMG_CUSTOM_4 766 -#define IMG_CUSTOM_4_EDITOR 767 -#define IMG_CUSTOM_5 768 -#define IMG_CUSTOM_5_EDITOR 769 -#define IMG_CUSTOM_6 770 -#define IMG_CUSTOM_6_EDITOR 771 -#define IMG_CUSTOM_7 772 -#define IMG_CUSTOM_7_EDITOR 773 -#define IMG_CUSTOM_8 774 -#define IMG_CUSTOM_8_EDITOR 775 -#define IMG_CUSTOM_9 776 -#define IMG_CUSTOM_9_EDITOR 777 -#define IMG_CUSTOM_10 778 -#define IMG_CUSTOM_10_EDITOR 779 -#define IMG_CUSTOM_11 780 -#define IMG_CUSTOM_11_EDITOR 781 -#define IMG_CUSTOM_12 782 -#define IMG_CUSTOM_12_EDITOR 783 -#define IMG_CUSTOM_13 784 -#define IMG_CUSTOM_13_EDITOR 785 -#define IMG_CUSTOM_14 786 -#define IMG_CUSTOM_14_EDITOR 787 -#define IMG_CUSTOM_15 788 -#define IMG_CUSTOM_15_EDITOR 789 -#define IMG_CUSTOM_16 790 -#define IMG_CUSTOM_16_EDITOR 791 -#define IMG_CUSTOM_17 792 -#define IMG_CUSTOM_17_EDITOR 793 -#define IMG_CUSTOM_18 794 -#define IMG_CUSTOM_18_EDITOR 795 -#define IMG_CUSTOM_19 796 -#define IMG_CUSTOM_19_EDITOR 797 -#define IMG_CUSTOM_20 798 -#define IMG_CUSTOM_20_EDITOR 799 -#define IMG_CUSTOM_21 800 -#define IMG_CUSTOM_21_EDITOR 801 -#define IMG_CUSTOM_22 802 -#define IMG_CUSTOM_22_EDITOR 803 -#define IMG_CUSTOM_23 804 -#define IMG_CUSTOM_23_EDITOR 805 -#define IMG_CUSTOM_24 806 -#define IMG_CUSTOM_24_EDITOR 807 -#define IMG_CUSTOM_25 808 -#define IMG_CUSTOM_25_EDITOR 809 -#define IMG_CUSTOM_26 810 -#define IMG_CUSTOM_26_EDITOR 811 -#define IMG_CUSTOM_27 812 -#define IMG_CUSTOM_27_EDITOR 813 -#define IMG_CUSTOM_28 814 -#define IMG_CUSTOM_28_EDITOR 815 -#define IMG_CUSTOM_29 816 -#define IMG_CUSTOM_29_EDITOR 817 -#define IMG_CUSTOM_30 818 -#define IMG_CUSTOM_30_EDITOR 819 -#define IMG_CUSTOM_31 820 -#define IMG_CUSTOM_31_EDITOR 821 -#define IMG_CUSTOM_32 822 -#define IMG_CUSTOM_32_EDITOR 823 -#define IMG_CUSTOM_33 824 -#define IMG_CUSTOM_33_EDITOR 825 -#define IMG_CUSTOM_34 826 -#define IMG_CUSTOM_34_EDITOR 827 -#define IMG_CUSTOM_35 828 -#define IMG_CUSTOM_35_EDITOR 829 -#define IMG_CUSTOM_36 830 -#define IMG_CUSTOM_36_EDITOR 831 -#define IMG_CUSTOM_37 832 -#define IMG_CUSTOM_37_EDITOR 833 -#define IMG_CUSTOM_38 834 -#define IMG_CUSTOM_38_EDITOR 835 -#define IMG_CUSTOM_39 836 -#define IMG_CUSTOM_39_EDITOR 837 -#define IMG_CUSTOM_40 838 -#define IMG_CUSTOM_40_EDITOR 839 -#define IMG_CUSTOM_41 840 -#define IMG_CUSTOM_41_EDITOR 841 -#define IMG_CUSTOM_42 842 -#define IMG_CUSTOM_42_EDITOR 843 -#define IMG_CUSTOM_43 844 -#define IMG_CUSTOM_43_EDITOR 845 -#define IMG_CUSTOM_44 846 -#define IMG_CUSTOM_44_EDITOR 847 -#define IMG_CUSTOM_45 848 -#define IMG_CUSTOM_45_EDITOR 849 -#define IMG_CUSTOM_46 850 -#define IMG_CUSTOM_46_EDITOR 851 -#define IMG_CUSTOM_47 852 -#define IMG_CUSTOM_47_EDITOR 853 -#define IMG_CUSTOM_48 854 -#define IMG_CUSTOM_48_EDITOR 855 -#define IMG_CUSTOM_49 856 -#define IMG_CUSTOM_49_EDITOR 857 -#define IMG_CUSTOM_50 858 -#define IMG_CUSTOM_50_EDITOR 859 -#define IMG_CUSTOM_51 860 -#define IMG_CUSTOM_51_EDITOR 861 -#define IMG_CUSTOM_52 862 -#define IMG_CUSTOM_52_EDITOR 863 -#define IMG_CUSTOM_53 864 -#define IMG_CUSTOM_53_EDITOR 865 -#define IMG_CUSTOM_54 866 -#define IMG_CUSTOM_54_EDITOR 867 -#define IMG_CUSTOM_55 868 -#define IMG_CUSTOM_55_EDITOR 869 -#define IMG_CUSTOM_56 870 -#define IMG_CUSTOM_56_EDITOR 871 -#define IMG_CUSTOM_57 872 -#define IMG_CUSTOM_57_EDITOR 873 -#define IMG_CUSTOM_58 874 -#define IMG_CUSTOM_58_EDITOR 875 -#define IMG_CUSTOM_59 876 -#define IMG_CUSTOM_59_EDITOR 877 -#define IMG_CUSTOM_60 878 -#define IMG_CUSTOM_60_EDITOR 879 -#define IMG_CUSTOM_61 880 -#define IMG_CUSTOM_61_EDITOR 881 -#define IMG_CUSTOM_62 882 -#define IMG_CUSTOM_62_EDITOR 883 -#define IMG_CUSTOM_63 884 -#define IMG_CUSTOM_63_EDITOR 885 -#define IMG_CUSTOM_64 886 -#define IMG_CUSTOM_64_EDITOR 887 -#define IMG_CUSTOM_65 888 -#define IMG_CUSTOM_65_EDITOR 889 -#define IMG_CUSTOM_66 890 -#define IMG_CUSTOM_66_EDITOR 891 -#define IMG_CUSTOM_67 892 -#define IMG_CUSTOM_67_EDITOR 893 -#define IMG_CUSTOM_68 894 -#define IMG_CUSTOM_68_EDITOR 895 -#define IMG_CUSTOM_69 896 -#define IMG_CUSTOM_69_EDITOR 897 -#define IMG_CUSTOM_70 898 -#define IMG_CUSTOM_70_EDITOR 899 -#define IMG_CUSTOM_71 900 -#define IMG_CUSTOM_71_EDITOR 901 -#define IMG_CUSTOM_72 902 -#define IMG_CUSTOM_72_EDITOR 903 -#define IMG_CUSTOM_73 904 -#define IMG_CUSTOM_73_EDITOR 905 -#define IMG_CUSTOM_74 906 -#define IMG_CUSTOM_74_EDITOR 907 -#define IMG_CUSTOM_75 908 -#define IMG_CUSTOM_75_EDITOR 909 -#define IMG_CUSTOM_76 910 -#define IMG_CUSTOM_76_EDITOR 911 -#define IMG_CUSTOM_77 912 -#define IMG_CUSTOM_77_EDITOR 913 -#define IMG_CUSTOM_78 914 -#define IMG_CUSTOM_78_EDITOR 915 -#define IMG_CUSTOM_79 916 -#define IMG_CUSTOM_79_EDITOR 917 -#define IMG_CUSTOM_80 918 -#define IMG_CUSTOM_80_EDITOR 919 -#define IMG_CUSTOM_81 920 -#define IMG_CUSTOM_81_EDITOR 921 -#define IMG_CUSTOM_82 922 -#define IMG_CUSTOM_82_EDITOR 923 -#define IMG_CUSTOM_83 924 -#define IMG_CUSTOM_83_EDITOR 925 -#define IMG_CUSTOM_84 926 -#define IMG_CUSTOM_84_EDITOR 927 -#define IMG_CUSTOM_85 928 -#define IMG_CUSTOM_85_EDITOR 929 -#define IMG_CUSTOM_86 930 -#define IMG_CUSTOM_86_EDITOR 931 -#define IMG_CUSTOM_87 932 -#define IMG_CUSTOM_87_EDITOR 933 -#define IMG_CUSTOM_88 934 -#define IMG_CUSTOM_88_EDITOR 935 -#define IMG_CUSTOM_89 936 -#define IMG_CUSTOM_89_EDITOR 937 -#define IMG_CUSTOM_90 938 -#define IMG_CUSTOM_90_EDITOR 939 -#define IMG_CUSTOM_91 940 -#define IMG_CUSTOM_91_EDITOR 941 -#define IMG_CUSTOM_92 942 -#define IMG_CUSTOM_92_EDITOR 943 -#define IMG_CUSTOM_93 944 -#define IMG_CUSTOM_93_EDITOR 945 -#define IMG_CUSTOM_94 946 -#define IMG_CUSTOM_94_EDITOR 947 -#define IMG_CUSTOM_95 948 -#define IMG_CUSTOM_95_EDITOR 949 -#define IMG_CUSTOM_96 950 -#define IMG_CUSTOM_96_EDITOR 951 -#define IMG_CUSTOM_97 952 -#define IMG_CUSTOM_97_EDITOR 953 -#define IMG_CUSTOM_98 954 -#define IMG_CUSTOM_98_EDITOR 955 -#define IMG_CUSTOM_99 956 -#define IMG_CUSTOM_99_EDITOR 957 -#define IMG_CUSTOM_100 958 -#define IMG_CUSTOM_100_EDITOR 959 -#define IMG_CUSTOM_101 960 -#define IMG_CUSTOM_101_EDITOR 961 -#define IMG_CUSTOM_102 962 -#define IMG_CUSTOM_102_EDITOR 963 -#define IMG_CUSTOM_103 964 -#define IMG_CUSTOM_103_EDITOR 965 -#define IMG_CUSTOM_104 966 -#define IMG_CUSTOM_104_EDITOR 967 -#define IMG_CUSTOM_105 968 -#define IMG_CUSTOM_105_EDITOR 969 -#define IMG_CUSTOM_106 970 -#define IMG_CUSTOM_106_EDITOR 971 -#define IMG_CUSTOM_107 972 -#define IMG_CUSTOM_107_EDITOR 973 -#define IMG_CUSTOM_108 974 -#define IMG_CUSTOM_108_EDITOR 975 -#define IMG_CUSTOM_109 976 -#define IMG_CUSTOM_109_EDITOR 977 -#define IMG_CUSTOM_110 978 -#define IMG_CUSTOM_110_EDITOR 979 -#define IMG_CUSTOM_111 980 -#define IMG_CUSTOM_111_EDITOR 981 -#define IMG_CUSTOM_112 982 -#define IMG_CUSTOM_112_EDITOR 983 -#define IMG_CUSTOM_113 984 -#define IMG_CUSTOM_113_EDITOR 985 -#define IMG_CUSTOM_114 986 -#define IMG_CUSTOM_114_EDITOR 987 -#define IMG_CUSTOM_115 988 -#define IMG_CUSTOM_115_EDITOR 989 -#define IMG_CUSTOM_116 990 -#define IMG_CUSTOM_116_EDITOR 991 -#define IMG_CUSTOM_117 992 -#define IMG_CUSTOM_117_EDITOR 993 -#define IMG_CUSTOM_118 994 -#define IMG_CUSTOM_118_EDITOR 995 -#define IMG_CUSTOM_119 996 -#define IMG_CUSTOM_119_EDITOR 997 -#define IMG_CUSTOM_120 998 -#define IMG_CUSTOM_120_EDITOR 999 -#define IMG_CUSTOM_121 1000 -#define IMG_CUSTOM_121_EDITOR 1001 -#define IMG_CUSTOM_122 1002 -#define IMG_CUSTOM_122_EDITOR 1003 -#define IMG_CUSTOM_123 1004 -#define IMG_CUSTOM_123_EDITOR 1005 -#define IMG_CUSTOM_124 1006 -#define IMG_CUSTOM_124_EDITOR 1007 -#define IMG_CUSTOM_125 1008 -#define IMG_CUSTOM_125_EDITOR 1009 -#define IMG_CUSTOM_126 1010 -#define IMG_CUSTOM_126_EDITOR 1011 -#define IMG_CUSTOM_127 1012 -#define IMG_CUSTOM_127_EDITOR 1013 -#define IMG_CUSTOM_128 1014 -#define IMG_CUSTOM_128_EDITOR 1015 -#define IMG_CUSTOM_129 1016 -#define IMG_CUSTOM_129_EDITOR 1017 -#define IMG_CUSTOM_130 1018 -#define IMG_CUSTOM_130_EDITOR 1019 -#define IMG_CUSTOM_131 1020 -#define IMG_CUSTOM_131_EDITOR 1021 -#define IMG_CUSTOM_132 1022 -#define IMG_CUSTOM_132_EDITOR 1023 -#define IMG_CUSTOM_133 1024 -#define IMG_CUSTOM_133_EDITOR 1025 -#define IMG_CUSTOM_134 1026 -#define IMG_CUSTOM_134_EDITOR 1027 -#define IMG_CUSTOM_135 1028 -#define IMG_CUSTOM_135_EDITOR 1029 -#define IMG_CUSTOM_136 1030 -#define IMG_CUSTOM_136_EDITOR 1031 -#define IMG_CUSTOM_137 1032 -#define IMG_CUSTOM_137_EDITOR 1033 -#define IMG_CUSTOM_138 1034 -#define IMG_CUSTOM_138_EDITOR 1035 -#define IMG_CUSTOM_139 1036 -#define IMG_CUSTOM_139_EDITOR 1037 -#define IMG_CUSTOM_140 1038 -#define IMG_CUSTOM_140_EDITOR 1039 -#define IMG_CUSTOM_141 1040 -#define IMG_CUSTOM_141_EDITOR 1041 -#define IMG_CUSTOM_142 1042 -#define IMG_CUSTOM_142_EDITOR 1043 -#define IMG_CUSTOM_143 1044 -#define IMG_CUSTOM_143_EDITOR 1045 -#define IMG_CUSTOM_144 1046 -#define IMG_CUSTOM_144_EDITOR 1047 -#define IMG_CUSTOM_145 1048 -#define IMG_CUSTOM_145_EDITOR 1049 -#define IMG_CUSTOM_146 1050 -#define IMG_CUSTOM_146_EDITOR 1051 -#define IMG_CUSTOM_147 1052 -#define IMG_CUSTOM_147_EDITOR 1053 -#define IMG_CUSTOM_148 1054 -#define IMG_CUSTOM_148_EDITOR 1055 -#define IMG_CUSTOM_149 1056 -#define IMG_CUSTOM_149_EDITOR 1057 -#define IMG_CUSTOM_150 1058 -#define IMG_CUSTOM_150_EDITOR 1059 -#define IMG_CUSTOM_151 1060 -#define IMG_CUSTOM_151_EDITOR 1061 -#define IMG_CUSTOM_152 1062 -#define IMG_CUSTOM_152_EDITOR 1063 -#define IMG_CUSTOM_153 1064 -#define IMG_CUSTOM_153_EDITOR 1065 -#define IMG_CUSTOM_154 1066 -#define IMG_CUSTOM_154_EDITOR 1067 -#define IMG_CUSTOM_155 1068 -#define IMG_CUSTOM_155_EDITOR 1069 -#define IMG_CUSTOM_156 1070 -#define IMG_CUSTOM_156_EDITOR 1071 -#define IMG_CUSTOM_157 1072 -#define IMG_CUSTOM_157_EDITOR 1073 -#define IMG_CUSTOM_158 1074 -#define IMG_CUSTOM_158_EDITOR 1075 -#define IMG_CUSTOM_159 1076 -#define IMG_CUSTOM_159_EDITOR 1077 -#define IMG_CUSTOM_160 1078 -#define IMG_CUSTOM_160_EDITOR 1079 -#define IMG_CUSTOM_161 1080 -#define IMG_CUSTOM_161_EDITOR 1081 -#define IMG_CUSTOM_162 1082 -#define IMG_CUSTOM_162_EDITOR 1083 -#define IMG_CUSTOM_163 1084 -#define IMG_CUSTOM_163_EDITOR 1085 -#define IMG_CUSTOM_164 1086 -#define IMG_CUSTOM_164_EDITOR 1087 -#define IMG_CUSTOM_165 1088 -#define IMG_CUSTOM_165_EDITOR 1089 -#define IMG_CUSTOM_166 1090 -#define IMG_CUSTOM_166_EDITOR 1091 -#define IMG_CUSTOM_167 1092 -#define IMG_CUSTOM_167_EDITOR 1093 -#define IMG_CUSTOM_168 1094 -#define IMG_CUSTOM_168_EDITOR 1095 -#define IMG_CUSTOM_169 1096 -#define IMG_CUSTOM_169_EDITOR 1097 -#define IMG_CUSTOM_170 1098 -#define IMG_CUSTOM_170_EDITOR 1099 -#define IMG_CUSTOM_171 1100 -#define IMG_CUSTOM_171_EDITOR 1101 -#define IMG_CUSTOM_172 1102 -#define IMG_CUSTOM_172_EDITOR 1103 -#define IMG_CUSTOM_173 1104 -#define IMG_CUSTOM_173_EDITOR 1105 -#define IMG_CUSTOM_174 1106 -#define IMG_CUSTOM_174_EDITOR 1107 -#define IMG_CUSTOM_175 1108 -#define IMG_CUSTOM_175_EDITOR 1109 -#define IMG_CUSTOM_176 1110 -#define IMG_CUSTOM_176_EDITOR 1111 -#define IMG_CUSTOM_177 1112 -#define IMG_CUSTOM_177_EDITOR 1113 -#define IMG_CUSTOM_178 1114 -#define IMG_CUSTOM_178_EDITOR 1115 -#define IMG_CUSTOM_179 1116 -#define IMG_CUSTOM_179_EDITOR 1117 -#define IMG_CUSTOM_180 1118 -#define IMG_CUSTOM_180_EDITOR 1119 -#define IMG_CUSTOM_181 1120 -#define IMG_CUSTOM_181_EDITOR 1121 -#define IMG_CUSTOM_182 1122 -#define IMG_CUSTOM_182_EDITOR 1123 -#define IMG_CUSTOM_183 1124 -#define IMG_CUSTOM_183_EDITOR 1125 -#define IMG_CUSTOM_184 1126 -#define IMG_CUSTOM_184_EDITOR 1127 -#define IMG_CUSTOM_185 1128 -#define IMG_CUSTOM_185_EDITOR 1129 -#define IMG_CUSTOM_186 1130 -#define IMG_CUSTOM_186_EDITOR 1131 -#define IMG_CUSTOM_187 1132 -#define IMG_CUSTOM_187_EDITOR 1133 -#define IMG_CUSTOM_188 1134 -#define IMG_CUSTOM_188_EDITOR 1135 -#define IMG_CUSTOM_189 1136 -#define IMG_CUSTOM_189_EDITOR 1137 -#define IMG_CUSTOM_190 1138 -#define IMG_CUSTOM_190_EDITOR 1139 -#define IMG_CUSTOM_191 1140 -#define IMG_CUSTOM_191_EDITOR 1141 -#define IMG_CUSTOM_192 1142 -#define IMG_CUSTOM_192_EDITOR 1143 -#define IMG_CUSTOM_193 1144 -#define IMG_CUSTOM_193_EDITOR 1145 -#define IMG_CUSTOM_194 1146 -#define IMG_CUSTOM_194_EDITOR 1147 -#define IMG_CUSTOM_195 1148 -#define IMG_CUSTOM_195_EDITOR 1149 -#define IMG_CUSTOM_196 1150 -#define IMG_CUSTOM_196_EDITOR 1151 -#define IMG_CUSTOM_197 1152 -#define IMG_CUSTOM_197_EDITOR 1153 -#define IMG_CUSTOM_198 1154 -#define IMG_CUSTOM_198_EDITOR 1155 -#define IMG_CUSTOM_199 1156 -#define IMG_CUSTOM_199_EDITOR 1157 -#define IMG_CUSTOM_200 1158 -#define IMG_CUSTOM_200_EDITOR 1159 -#define IMG_CUSTOM_201 1160 -#define IMG_CUSTOM_201_EDITOR 1161 -#define IMG_CUSTOM_202 1162 -#define IMG_CUSTOM_202_EDITOR 1163 -#define IMG_CUSTOM_203 1164 -#define IMG_CUSTOM_203_EDITOR 1165 -#define IMG_CUSTOM_204 1166 -#define IMG_CUSTOM_204_EDITOR 1167 -#define IMG_CUSTOM_205 1168 -#define IMG_CUSTOM_205_EDITOR 1169 -#define IMG_CUSTOM_206 1170 -#define IMG_CUSTOM_206_EDITOR 1171 -#define IMG_CUSTOM_207 1172 -#define IMG_CUSTOM_207_EDITOR 1173 -#define IMG_CUSTOM_208 1174 -#define IMG_CUSTOM_208_EDITOR 1175 -#define IMG_CUSTOM_209 1176 -#define IMG_CUSTOM_209_EDITOR 1177 -#define IMG_CUSTOM_210 1178 -#define IMG_CUSTOM_210_EDITOR 1179 -#define IMG_CUSTOM_211 1180 -#define IMG_CUSTOM_211_EDITOR 1181 -#define IMG_CUSTOM_212 1182 -#define IMG_CUSTOM_212_EDITOR 1183 -#define IMG_CUSTOM_213 1184 -#define IMG_CUSTOM_213_EDITOR 1185 -#define IMG_CUSTOM_214 1186 -#define IMG_CUSTOM_214_EDITOR 1187 -#define IMG_CUSTOM_215 1188 -#define IMG_CUSTOM_215_EDITOR 1189 -#define IMG_CUSTOM_216 1190 -#define IMG_CUSTOM_216_EDITOR 1191 -#define IMG_CUSTOM_217 1192 -#define IMG_CUSTOM_217_EDITOR 1193 -#define IMG_CUSTOM_218 1194 -#define IMG_CUSTOM_218_EDITOR 1195 -#define IMG_CUSTOM_219 1196 -#define IMG_CUSTOM_219_EDITOR 1197 -#define IMG_CUSTOM_220 1198 -#define IMG_CUSTOM_220_EDITOR 1199 -#define IMG_CUSTOM_221 1200 -#define IMG_CUSTOM_221_EDITOR 1201 -#define IMG_CUSTOM_222 1202 -#define IMG_CUSTOM_222_EDITOR 1203 -#define IMG_CUSTOM_223 1204 -#define IMG_CUSTOM_223_EDITOR 1205 -#define IMG_CUSTOM_224 1206 -#define IMG_CUSTOM_224_EDITOR 1207 -#define IMG_CUSTOM_225 1208 -#define IMG_CUSTOM_225_EDITOR 1209 -#define IMG_CUSTOM_226 1210 -#define IMG_CUSTOM_226_EDITOR 1211 -#define IMG_CUSTOM_227 1212 -#define IMG_CUSTOM_227_EDITOR 1213 -#define IMG_CUSTOM_228 1214 -#define IMG_CUSTOM_228_EDITOR 1215 -#define IMG_CUSTOM_229 1216 -#define IMG_CUSTOM_229_EDITOR 1217 -#define IMG_CUSTOM_230 1218 -#define IMG_CUSTOM_230_EDITOR 1219 -#define IMG_CUSTOM_231 1220 -#define IMG_CUSTOM_231_EDITOR 1221 -#define IMG_CUSTOM_232 1222 -#define IMG_CUSTOM_232_EDITOR 1223 -#define IMG_CUSTOM_233 1224 -#define IMG_CUSTOM_233_EDITOR 1225 -#define IMG_CUSTOM_234 1226 -#define IMG_CUSTOM_234_EDITOR 1227 -#define IMG_CUSTOM_235 1228 -#define IMG_CUSTOM_235_EDITOR 1229 -#define IMG_CUSTOM_236 1230 -#define IMG_CUSTOM_236_EDITOR 1231 -#define IMG_CUSTOM_237 1232 -#define IMG_CUSTOM_237_EDITOR 1233 -#define IMG_CUSTOM_238 1234 -#define IMG_CUSTOM_238_EDITOR 1235 -#define IMG_CUSTOM_239 1236 -#define IMG_CUSTOM_239_EDITOR 1237 -#define IMG_CUSTOM_240 1238 -#define IMG_CUSTOM_240_EDITOR 1239 -#define IMG_CUSTOM_241 1240 -#define IMG_CUSTOM_241_EDITOR 1241 -#define IMG_CUSTOM_242 1242 -#define IMG_CUSTOM_242_EDITOR 1243 -#define IMG_CUSTOM_243 1244 -#define IMG_CUSTOM_243_EDITOR 1245 -#define IMG_CUSTOM_244 1246 -#define IMG_CUSTOM_244_EDITOR 1247 -#define IMG_CUSTOM_245 1248 -#define IMG_CUSTOM_245_EDITOR 1249 -#define IMG_CUSTOM_246 1250 -#define IMG_CUSTOM_246_EDITOR 1251 -#define IMG_CUSTOM_247 1252 -#define IMG_CUSTOM_247_EDITOR 1253 -#define IMG_CUSTOM_248 1254 -#define IMG_CUSTOM_248_EDITOR 1255 -#define IMG_CUSTOM_249 1256 -#define IMG_CUSTOM_249_EDITOR 1257 -#define IMG_CUSTOM_250 1258 -#define IMG_CUSTOM_250_EDITOR 1259 -#define IMG_CUSTOM_251 1260 -#define IMG_CUSTOM_251_EDITOR 1261 -#define IMG_CUSTOM_252 1262 -#define IMG_CUSTOM_252_EDITOR 1263 -#define IMG_CUSTOM_253 1264 -#define IMG_CUSTOM_253_EDITOR 1265 -#define IMG_CUSTOM_254 1266 -#define IMG_CUSTOM_254_EDITOR 1267 -#define IMG_CUSTOM_255 1268 -#define IMG_CUSTOM_255_EDITOR 1269 -#define IMG_CUSTOM_256 1270 -#define IMG_CUSTOM_256_EDITOR 1271 -#define IMG_GROUP_1 1272 -#define IMG_GROUP_1_EDITOR 1273 -#define IMG_GROUP_2 1274 -#define IMG_GROUP_2_EDITOR 1275 -#define IMG_GROUP_3 1276 -#define IMG_GROUP_3_EDITOR 1277 -#define IMG_GROUP_4 1278 -#define IMG_GROUP_4_EDITOR 1279 -#define IMG_GROUP_5 1280 -#define IMG_GROUP_5_EDITOR 1281 -#define IMG_GROUP_6 1282 -#define IMG_GROUP_6_EDITOR 1283 -#define IMG_GROUP_7 1284 -#define IMG_GROUP_7_EDITOR 1285 -#define IMG_GROUP_8 1286 -#define IMG_GROUP_8_EDITOR 1287 -#define IMG_GROUP_9 1288 -#define IMG_GROUP_9_EDITOR 1289 -#define IMG_GROUP_10 1290 -#define IMG_GROUP_10_EDITOR 1291 -#define IMG_GROUP_11 1292 -#define IMG_GROUP_11_EDITOR 1293 -#define IMG_GROUP_12 1294 -#define IMG_GROUP_12_EDITOR 1295 -#define IMG_GROUP_13 1296 -#define IMG_GROUP_13_EDITOR 1297 -#define IMG_GROUP_14 1298 -#define IMG_GROUP_14_EDITOR 1299 -#define IMG_GROUP_15 1300 -#define IMG_GROUP_15_EDITOR 1301 -#define IMG_GROUP_16 1302 -#define IMG_GROUP_16_EDITOR 1303 -#define IMG_GROUP_17 1304 -#define IMG_GROUP_17_EDITOR 1305 -#define IMG_GROUP_18 1306 -#define IMG_GROUP_18_EDITOR 1307 -#define IMG_GROUP_19 1308 -#define IMG_GROUP_19_EDITOR 1309 -#define IMG_GROUP_20 1310 -#define IMG_GROUP_20_EDITOR 1311 -#define IMG_GROUP_21 1312 -#define IMG_GROUP_21_EDITOR 1313 -#define IMG_GROUP_22 1314 -#define IMG_GROUP_22_EDITOR 1315 -#define IMG_GROUP_23 1316 -#define IMG_GROUP_23_EDITOR 1317 -#define IMG_GROUP_24 1318 -#define IMG_GROUP_24_EDITOR 1319 -#define IMG_GROUP_25 1320 -#define IMG_GROUP_25_EDITOR 1321 -#define IMG_GROUP_26 1322 -#define IMG_GROUP_26_EDITOR 1323 -#define IMG_GROUP_27 1324 -#define IMG_GROUP_27_EDITOR 1325 -#define IMG_GROUP_28 1326 -#define IMG_GROUP_28_EDITOR 1327 -#define IMG_GROUP_29 1328 -#define IMG_GROUP_29_EDITOR 1329 -#define IMG_GROUP_30 1330 -#define IMG_GROUP_30_EDITOR 1331 -#define IMG_GROUP_31 1332 -#define IMG_GROUP_31_EDITOR 1333 -#define IMG_GROUP_32 1334 -#define IMG_GROUP_32_EDITOR 1335 -#define IMG_EMC_OBJECT 1336 -#define IMG_EMC_SPRITE 1337 -#define IMG_TOON_1 1338 -#define IMG_TOON_2 1339 -#define IMG_TOON_3 1340 -#define IMG_TOON_4 1341 -#define IMG_TOON_5 1342 -#define IMG_TOON_6 1343 -#define IMG_TOON_7 1344 -#define IMG_TOON_8 1345 -#define IMG_TOON_9 1346 -#define IMG_TOON_10 1347 -#define IMG_TOON_11 1348 -#define IMG_TOON_12 1349 -#define IMG_TOON_13 1350 -#define IMG_TOON_14 1351 -#define IMG_TOON_15 1352 -#define IMG_TOON_16 1353 -#define IMG_TOON_17 1354 -#define IMG_TOON_18 1355 -#define IMG_TOON_19 1356 -#define IMG_TOON_20 1357 -#define IMG_MENU_CALIBRATE_RED 1358 -#define IMG_MENU_CALIBRATE_BLUE 1359 -#define IMG_MENU_CALIBRATE_YELLOW 1360 -#define IMG_MENU_BUTTON 1361 -#define IMG_MENU_BUTTON_ACTIVE 1362 -#define IMG_MENU_BUTTON_LEFT 1363 -#define IMG_MENU_BUTTON_RIGHT 1364 -#define IMG_MENU_BUTTON_UP 1365 -#define IMG_MENU_BUTTON_DOWN 1366 -#define IMG_MENU_BUTTON_LEFT_ACTIVE 1367 -#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1368 -#define IMG_MENU_BUTTON_UP_ACTIVE 1369 -#define IMG_MENU_BUTTON_DOWN_ACTIVE 1370 -#define IMG_MENU_SCROLLBAR 1371 -#define IMG_MENU_SCROLLBAR_ACTIVE 1372 -#define IMG_FONT_INITIAL_1 1373 -#define IMG_FONT_INITIAL_2 1374 -#define IMG_FONT_INITIAL_3 1375 -#define IMG_FONT_INITIAL_4 1376 -#define IMG_FONT_TITLE_1 1377 -#define IMG_FONT_TITLE_1_LEVELS 1378 -#define IMG_FONT_TITLE_2 1379 -#define IMG_FONT_MENU_1 1380 -#define IMG_FONT_MENU_2 1381 -#define IMG_FONT_TEXT_1 1382 -#define IMG_FONT_TEXT_1_LEVELS 1383 -#define IMG_FONT_TEXT_1_PREVIEW 1384 -#define IMG_FONT_TEXT_1_SCORES 1385 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1386 -#define IMG_FONT_TEXT_2 1387 -#define IMG_FONT_TEXT_2_LEVELS 1388 -#define IMG_FONT_TEXT_2_PREVIEW 1389 -#define IMG_FONT_TEXT_2_SCORES 1390 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1391 -#define IMG_FONT_TEXT_3 1392 -#define IMG_FONT_TEXT_3_LEVELS 1393 -#define IMG_FONT_TEXT_3_PREVIEW 1394 -#define IMG_FONT_TEXT_3_SCORES 1395 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1396 -#define IMG_FONT_TEXT_4 1397 -#define IMG_FONT_TEXT_4_LEVELS 1398 -#define IMG_FONT_TEXT_4_SCORES 1399 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1400 -#define IMG_FONT_ENVELOPE_1 1401 -#define IMG_FONT_ENVELOPE_2 1402 -#define IMG_FONT_ENVELOPE_3 1403 -#define IMG_FONT_ENVELOPE_4 1404 -#define IMG_FONT_INPUT_1 1405 -#define IMG_FONT_INPUT_1_MAIN 1406 -#define IMG_FONT_INPUT_1_ACTIVE 1407 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1408 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1409 -#define IMG_FONT_INPUT_2 1410 -#define IMG_FONT_INPUT_2_ACTIVE 1411 -#define IMG_FONT_OPTION_OFF 1412 -#define IMG_FONT_OPTION_ON 1413 -#define IMG_FONT_VALUE_1 1414 -#define IMG_FONT_VALUE_2 1415 -#define IMG_FONT_VALUE_OLD 1416 -#define IMG_FONT_LEVEL_NUMBER 1417 -#define IMG_FONT_TAPE_RECORDER 1418 -#define IMG_FONT_GAME_INFO 1419 -#define IMG_GLOBAL_BORDER 1420 -#define IMG_GLOBAL_DOOR 1421 -#define IMG_EDITOR_ELEMENT_BORDER 1422 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1423 -#define IMG_BACKGROUND_ENVELOPE_1 1424 -#define IMG_BACKGROUND_ENVELOPE_2 1425 -#define IMG_BACKGROUND_ENVELOPE_3 1426 -#define IMG_BACKGROUND_ENVELOPE_4 1427 -#define IMG_BACKGROUND 1428 -#define IMG_BACKGROUND_MAIN 1429 -#define IMG_BACKGROUND_LEVELS 1430 -#define IMG_BACKGROUND_SCORES 1431 -#define IMG_BACKGROUND_EDITOR 1432 -#define IMG_BACKGROUND_INFO 1433 -#define IMG_BACKGROUND_INFO_ELEMENTS 1434 -#define IMG_BACKGROUND_SETUP 1435 -#define IMG_BACKGROUND_DOOR 1436 +#define IMG_EMC_DRIPPER 689 +#define IMG_CHAR_SPACE 690 +#define IMG_CHAR_EXCLAM 691 +#define IMG_CHAR_QUOTEDBL 692 +#define IMG_CHAR_NUMBERSIGN 693 +#define IMG_CHAR_DOLLAR 694 +#define IMG_CHAR_PROCENT 695 +#define IMG_CHAR_AMPERSAND 696 +#define IMG_CHAR_APOSTROPHE 697 +#define IMG_CHAR_PARENLEFT 698 +#define IMG_CHAR_PARENRIGHT 699 +#define IMG_CHAR_ASTERISK 700 +#define IMG_CHAR_PLUS 701 +#define IMG_CHAR_COMMA 702 +#define IMG_CHAR_MINUS 703 +#define IMG_CHAR_PERIOD 704 +#define IMG_CHAR_SLASH 705 +#define IMG_CHAR_0 706 +#define IMG_CHAR_1 707 +#define IMG_CHAR_2 708 +#define IMG_CHAR_3 709 +#define IMG_CHAR_4 710 +#define IMG_CHAR_5 711 +#define IMG_CHAR_6 712 +#define IMG_CHAR_7 713 +#define IMG_CHAR_8 714 +#define IMG_CHAR_9 715 +#define IMG_CHAR_COLON 716 +#define IMG_CHAR_SEMICOLON 717 +#define IMG_CHAR_LESS 718 +#define IMG_CHAR_EQUAL 719 +#define IMG_CHAR_GREATER 720 +#define IMG_CHAR_QUESTION 721 +#define IMG_CHAR_AT 722 +#define IMG_CHAR_A 723 +#define IMG_CHAR_B 724 +#define IMG_CHAR_C 725 +#define IMG_CHAR_D 726 +#define IMG_CHAR_E 727 +#define IMG_CHAR_F 728 +#define IMG_CHAR_G 729 +#define IMG_CHAR_H 730 +#define IMG_CHAR_I 731 +#define IMG_CHAR_J 732 +#define IMG_CHAR_K 733 +#define IMG_CHAR_L 734 +#define IMG_CHAR_M 735 +#define IMG_CHAR_N 736 +#define IMG_CHAR_O 737 +#define IMG_CHAR_P 738 +#define IMG_CHAR_Q 739 +#define IMG_CHAR_R 740 +#define IMG_CHAR_S 741 +#define IMG_CHAR_T 742 +#define IMG_CHAR_U 743 +#define IMG_CHAR_V 744 +#define IMG_CHAR_W 745 +#define IMG_CHAR_X 746 +#define IMG_CHAR_Y 747 +#define IMG_CHAR_Z 748 +#define IMG_CHAR_BRACKETLEFT 749 +#define IMG_CHAR_BACKSLASH 750 +#define IMG_CHAR_BRACKETRIGHT 751 +#define IMG_CHAR_ASCIICIRCUM 752 +#define IMG_CHAR_UNDERSCORE 753 +#define IMG_CHAR_COPYRIGHT 754 +#define IMG_CHAR_AUMLAUT 755 +#define IMG_CHAR_OUMLAUT 756 +#define IMG_CHAR_UUMLAUT 757 +#define IMG_CHAR_DEGREE 758 +#define IMG_CHAR_TRADEMARK 759 +#define IMG_CHAR_CURSOR 760 +#define IMG_CUSTOM_1 761 +#define IMG_CUSTOM_1_EDITOR 762 +#define IMG_CUSTOM_2 763 +#define IMG_CUSTOM_2_EDITOR 764 +#define IMG_CUSTOM_3 765 +#define IMG_CUSTOM_3_EDITOR 766 +#define IMG_CUSTOM_4 767 +#define IMG_CUSTOM_4_EDITOR 768 +#define IMG_CUSTOM_5 769 +#define IMG_CUSTOM_5_EDITOR 770 +#define IMG_CUSTOM_6 771 +#define IMG_CUSTOM_6_EDITOR 772 +#define IMG_CUSTOM_7 773 +#define IMG_CUSTOM_7_EDITOR 774 +#define IMG_CUSTOM_8 775 +#define IMG_CUSTOM_8_EDITOR 776 +#define IMG_CUSTOM_9 777 +#define IMG_CUSTOM_9_EDITOR 778 +#define IMG_CUSTOM_10 779 +#define IMG_CUSTOM_10_EDITOR 780 +#define IMG_CUSTOM_11 781 +#define IMG_CUSTOM_11_EDITOR 782 +#define IMG_CUSTOM_12 783 +#define IMG_CUSTOM_12_EDITOR 784 +#define IMG_CUSTOM_13 785 +#define IMG_CUSTOM_13_EDITOR 786 +#define IMG_CUSTOM_14 787 +#define IMG_CUSTOM_14_EDITOR 788 +#define IMG_CUSTOM_15 789 +#define IMG_CUSTOM_15_EDITOR 790 +#define IMG_CUSTOM_16 791 +#define IMG_CUSTOM_16_EDITOR 792 +#define IMG_CUSTOM_17 793 +#define IMG_CUSTOM_17_EDITOR 794 +#define IMG_CUSTOM_18 795 +#define IMG_CUSTOM_18_EDITOR 796 +#define IMG_CUSTOM_19 797 +#define IMG_CUSTOM_19_EDITOR 798 +#define IMG_CUSTOM_20 799 +#define IMG_CUSTOM_20_EDITOR 800 +#define IMG_CUSTOM_21 801 +#define IMG_CUSTOM_21_EDITOR 802 +#define IMG_CUSTOM_22 803 +#define IMG_CUSTOM_22_EDITOR 804 +#define IMG_CUSTOM_23 805 +#define IMG_CUSTOM_23_EDITOR 806 +#define IMG_CUSTOM_24 807 +#define IMG_CUSTOM_24_EDITOR 808 +#define IMG_CUSTOM_25 809 +#define IMG_CUSTOM_25_EDITOR 810 +#define IMG_CUSTOM_26 811 +#define IMG_CUSTOM_26_EDITOR 812 +#define IMG_CUSTOM_27 813 +#define IMG_CUSTOM_27_EDITOR 814 +#define IMG_CUSTOM_28 815 +#define IMG_CUSTOM_28_EDITOR 816 +#define IMG_CUSTOM_29 817 +#define IMG_CUSTOM_29_EDITOR 818 +#define IMG_CUSTOM_30 819 +#define IMG_CUSTOM_30_EDITOR 820 +#define IMG_CUSTOM_31 821 +#define IMG_CUSTOM_31_EDITOR 822 +#define IMG_CUSTOM_32 823 +#define IMG_CUSTOM_32_EDITOR 824 +#define IMG_CUSTOM_33 825 +#define IMG_CUSTOM_33_EDITOR 826 +#define IMG_CUSTOM_34 827 +#define IMG_CUSTOM_34_EDITOR 828 +#define IMG_CUSTOM_35 829 +#define IMG_CUSTOM_35_EDITOR 830 +#define IMG_CUSTOM_36 831 +#define IMG_CUSTOM_36_EDITOR 832 +#define IMG_CUSTOM_37 833 +#define IMG_CUSTOM_37_EDITOR 834 +#define IMG_CUSTOM_38 835 +#define IMG_CUSTOM_38_EDITOR 836 +#define IMG_CUSTOM_39 837 +#define IMG_CUSTOM_39_EDITOR 838 +#define IMG_CUSTOM_40 839 +#define IMG_CUSTOM_40_EDITOR 840 +#define IMG_CUSTOM_41 841 +#define IMG_CUSTOM_41_EDITOR 842 +#define IMG_CUSTOM_42 843 +#define IMG_CUSTOM_42_EDITOR 844 +#define IMG_CUSTOM_43 845 +#define IMG_CUSTOM_43_EDITOR 846 +#define IMG_CUSTOM_44 847 +#define IMG_CUSTOM_44_EDITOR 848 +#define IMG_CUSTOM_45 849 +#define IMG_CUSTOM_45_EDITOR 850 +#define IMG_CUSTOM_46 851 +#define IMG_CUSTOM_46_EDITOR 852 +#define IMG_CUSTOM_47 853 +#define IMG_CUSTOM_47_EDITOR 854 +#define IMG_CUSTOM_48 855 +#define IMG_CUSTOM_48_EDITOR 856 +#define IMG_CUSTOM_49 857 +#define IMG_CUSTOM_49_EDITOR 858 +#define IMG_CUSTOM_50 859 +#define IMG_CUSTOM_50_EDITOR 860 +#define IMG_CUSTOM_51 861 +#define IMG_CUSTOM_51_EDITOR 862 +#define IMG_CUSTOM_52 863 +#define IMG_CUSTOM_52_EDITOR 864 +#define IMG_CUSTOM_53 865 +#define IMG_CUSTOM_53_EDITOR 866 +#define IMG_CUSTOM_54 867 +#define IMG_CUSTOM_54_EDITOR 868 +#define IMG_CUSTOM_55 869 +#define IMG_CUSTOM_55_EDITOR 870 +#define IMG_CUSTOM_56 871 +#define IMG_CUSTOM_56_EDITOR 872 +#define IMG_CUSTOM_57 873 +#define IMG_CUSTOM_57_EDITOR 874 +#define IMG_CUSTOM_58 875 +#define IMG_CUSTOM_58_EDITOR 876 +#define IMG_CUSTOM_59 877 +#define IMG_CUSTOM_59_EDITOR 878 +#define IMG_CUSTOM_60 879 +#define IMG_CUSTOM_60_EDITOR 880 +#define IMG_CUSTOM_61 881 +#define IMG_CUSTOM_61_EDITOR 882 +#define IMG_CUSTOM_62 883 +#define IMG_CUSTOM_62_EDITOR 884 +#define IMG_CUSTOM_63 885 +#define IMG_CUSTOM_63_EDITOR 886 +#define IMG_CUSTOM_64 887 +#define IMG_CUSTOM_64_EDITOR 888 +#define IMG_CUSTOM_65 889 +#define IMG_CUSTOM_65_EDITOR 890 +#define IMG_CUSTOM_66 891 +#define IMG_CUSTOM_66_EDITOR 892 +#define IMG_CUSTOM_67 893 +#define IMG_CUSTOM_67_EDITOR 894 +#define IMG_CUSTOM_68 895 +#define IMG_CUSTOM_68_EDITOR 896 +#define IMG_CUSTOM_69 897 +#define IMG_CUSTOM_69_EDITOR 898 +#define IMG_CUSTOM_70 899 +#define IMG_CUSTOM_70_EDITOR 900 +#define IMG_CUSTOM_71 901 +#define IMG_CUSTOM_71_EDITOR 902 +#define IMG_CUSTOM_72 903 +#define IMG_CUSTOM_72_EDITOR 904 +#define IMG_CUSTOM_73 905 +#define IMG_CUSTOM_73_EDITOR 906 +#define IMG_CUSTOM_74 907 +#define IMG_CUSTOM_74_EDITOR 908 +#define IMG_CUSTOM_75 909 +#define IMG_CUSTOM_75_EDITOR 910 +#define IMG_CUSTOM_76 911 +#define IMG_CUSTOM_76_EDITOR 912 +#define IMG_CUSTOM_77 913 +#define IMG_CUSTOM_77_EDITOR 914 +#define IMG_CUSTOM_78 915 +#define IMG_CUSTOM_78_EDITOR 916 +#define IMG_CUSTOM_79 917 +#define IMG_CUSTOM_79_EDITOR 918 +#define IMG_CUSTOM_80 919 +#define IMG_CUSTOM_80_EDITOR 920 +#define IMG_CUSTOM_81 921 +#define IMG_CUSTOM_81_EDITOR 922 +#define IMG_CUSTOM_82 923 +#define IMG_CUSTOM_82_EDITOR 924 +#define IMG_CUSTOM_83 925 +#define IMG_CUSTOM_83_EDITOR 926 +#define IMG_CUSTOM_84 927 +#define IMG_CUSTOM_84_EDITOR 928 +#define IMG_CUSTOM_85 929 +#define IMG_CUSTOM_85_EDITOR 930 +#define IMG_CUSTOM_86 931 +#define IMG_CUSTOM_86_EDITOR 932 +#define IMG_CUSTOM_87 933 +#define IMG_CUSTOM_87_EDITOR 934 +#define IMG_CUSTOM_88 935 +#define IMG_CUSTOM_88_EDITOR 936 +#define IMG_CUSTOM_89 937 +#define IMG_CUSTOM_89_EDITOR 938 +#define IMG_CUSTOM_90 939 +#define IMG_CUSTOM_90_EDITOR 940 +#define IMG_CUSTOM_91 941 +#define IMG_CUSTOM_91_EDITOR 942 +#define IMG_CUSTOM_92 943 +#define IMG_CUSTOM_92_EDITOR 944 +#define IMG_CUSTOM_93 945 +#define IMG_CUSTOM_93_EDITOR 946 +#define IMG_CUSTOM_94 947 +#define IMG_CUSTOM_94_EDITOR 948 +#define IMG_CUSTOM_95 949 +#define IMG_CUSTOM_95_EDITOR 950 +#define IMG_CUSTOM_96 951 +#define IMG_CUSTOM_96_EDITOR 952 +#define IMG_CUSTOM_97 953 +#define IMG_CUSTOM_97_EDITOR 954 +#define IMG_CUSTOM_98 955 +#define IMG_CUSTOM_98_EDITOR 956 +#define IMG_CUSTOM_99 957 +#define IMG_CUSTOM_99_EDITOR 958 +#define IMG_CUSTOM_100 959 +#define IMG_CUSTOM_100_EDITOR 960 +#define IMG_CUSTOM_101 961 +#define IMG_CUSTOM_101_EDITOR 962 +#define IMG_CUSTOM_102 963 +#define IMG_CUSTOM_102_EDITOR 964 +#define IMG_CUSTOM_103 965 +#define IMG_CUSTOM_103_EDITOR 966 +#define IMG_CUSTOM_104 967 +#define IMG_CUSTOM_104_EDITOR 968 +#define IMG_CUSTOM_105 969 +#define IMG_CUSTOM_105_EDITOR 970 +#define IMG_CUSTOM_106 971 +#define IMG_CUSTOM_106_EDITOR 972 +#define IMG_CUSTOM_107 973 +#define IMG_CUSTOM_107_EDITOR 974 +#define IMG_CUSTOM_108 975 +#define IMG_CUSTOM_108_EDITOR 976 +#define IMG_CUSTOM_109 977 +#define IMG_CUSTOM_109_EDITOR 978 +#define IMG_CUSTOM_110 979 +#define IMG_CUSTOM_110_EDITOR 980 +#define IMG_CUSTOM_111 981 +#define IMG_CUSTOM_111_EDITOR 982 +#define IMG_CUSTOM_112 983 +#define IMG_CUSTOM_112_EDITOR 984 +#define IMG_CUSTOM_113 985 +#define IMG_CUSTOM_113_EDITOR 986 +#define IMG_CUSTOM_114 987 +#define IMG_CUSTOM_114_EDITOR 988 +#define IMG_CUSTOM_115 989 +#define IMG_CUSTOM_115_EDITOR 990 +#define IMG_CUSTOM_116 991 +#define IMG_CUSTOM_116_EDITOR 992 +#define IMG_CUSTOM_117 993 +#define IMG_CUSTOM_117_EDITOR 994 +#define IMG_CUSTOM_118 995 +#define IMG_CUSTOM_118_EDITOR 996 +#define IMG_CUSTOM_119 997 +#define IMG_CUSTOM_119_EDITOR 998 +#define IMG_CUSTOM_120 999 +#define IMG_CUSTOM_120_EDITOR 1000 +#define IMG_CUSTOM_121 1001 +#define IMG_CUSTOM_121_EDITOR 1002 +#define IMG_CUSTOM_122 1003 +#define IMG_CUSTOM_122_EDITOR 1004 +#define IMG_CUSTOM_123 1005 +#define IMG_CUSTOM_123_EDITOR 1006 +#define IMG_CUSTOM_124 1007 +#define IMG_CUSTOM_124_EDITOR 1008 +#define IMG_CUSTOM_125 1009 +#define IMG_CUSTOM_125_EDITOR 1010 +#define IMG_CUSTOM_126 1011 +#define IMG_CUSTOM_126_EDITOR 1012 +#define IMG_CUSTOM_127 1013 +#define IMG_CUSTOM_127_EDITOR 1014 +#define IMG_CUSTOM_128 1015 +#define IMG_CUSTOM_128_EDITOR 1016 +#define IMG_CUSTOM_129 1017 +#define IMG_CUSTOM_129_EDITOR 1018 +#define IMG_CUSTOM_130 1019 +#define IMG_CUSTOM_130_EDITOR 1020 +#define IMG_CUSTOM_131 1021 +#define IMG_CUSTOM_131_EDITOR 1022 +#define IMG_CUSTOM_132 1023 +#define IMG_CUSTOM_132_EDITOR 1024 +#define IMG_CUSTOM_133 1025 +#define IMG_CUSTOM_133_EDITOR 1026 +#define IMG_CUSTOM_134 1027 +#define IMG_CUSTOM_134_EDITOR 1028 +#define IMG_CUSTOM_135 1029 +#define IMG_CUSTOM_135_EDITOR 1030 +#define IMG_CUSTOM_136 1031 +#define IMG_CUSTOM_136_EDITOR 1032 +#define IMG_CUSTOM_137 1033 +#define IMG_CUSTOM_137_EDITOR 1034 +#define IMG_CUSTOM_138 1035 +#define IMG_CUSTOM_138_EDITOR 1036 +#define IMG_CUSTOM_139 1037 +#define IMG_CUSTOM_139_EDITOR 1038 +#define IMG_CUSTOM_140 1039 +#define IMG_CUSTOM_140_EDITOR 1040 +#define IMG_CUSTOM_141 1041 +#define IMG_CUSTOM_141_EDITOR 1042 +#define IMG_CUSTOM_142 1043 +#define IMG_CUSTOM_142_EDITOR 1044 +#define IMG_CUSTOM_143 1045 +#define IMG_CUSTOM_143_EDITOR 1046 +#define IMG_CUSTOM_144 1047 +#define IMG_CUSTOM_144_EDITOR 1048 +#define IMG_CUSTOM_145 1049 +#define IMG_CUSTOM_145_EDITOR 1050 +#define IMG_CUSTOM_146 1051 +#define IMG_CUSTOM_146_EDITOR 1052 +#define IMG_CUSTOM_147 1053 +#define IMG_CUSTOM_147_EDITOR 1054 +#define IMG_CUSTOM_148 1055 +#define IMG_CUSTOM_148_EDITOR 1056 +#define IMG_CUSTOM_149 1057 +#define IMG_CUSTOM_149_EDITOR 1058 +#define IMG_CUSTOM_150 1059 +#define IMG_CUSTOM_150_EDITOR 1060 +#define IMG_CUSTOM_151 1061 +#define IMG_CUSTOM_151_EDITOR 1062 +#define IMG_CUSTOM_152 1063 +#define IMG_CUSTOM_152_EDITOR 1064 +#define IMG_CUSTOM_153 1065 +#define IMG_CUSTOM_153_EDITOR 1066 +#define IMG_CUSTOM_154 1067 +#define IMG_CUSTOM_154_EDITOR 1068 +#define IMG_CUSTOM_155 1069 +#define IMG_CUSTOM_155_EDITOR 1070 +#define IMG_CUSTOM_156 1071 +#define IMG_CUSTOM_156_EDITOR 1072 +#define IMG_CUSTOM_157 1073 +#define IMG_CUSTOM_157_EDITOR 1074 +#define IMG_CUSTOM_158 1075 +#define IMG_CUSTOM_158_EDITOR 1076 +#define IMG_CUSTOM_159 1077 +#define IMG_CUSTOM_159_EDITOR 1078 +#define IMG_CUSTOM_160 1079 +#define IMG_CUSTOM_160_EDITOR 1080 +#define IMG_CUSTOM_161 1081 +#define IMG_CUSTOM_161_EDITOR 1082 +#define IMG_CUSTOM_162 1083 +#define IMG_CUSTOM_162_EDITOR 1084 +#define IMG_CUSTOM_163 1085 +#define IMG_CUSTOM_163_EDITOR 1086 +#define IMG_CUSTOM_164 1087 +#define IMG_CUSTOM_164_EDITOR 1088 +#define IMG_CUSTOM_165 1089 +#define IMG_CUSTOM_165_EDITOR 1090 +#define IMG_CUSTOM_166 1091 +#define IMG_CUSTOM_166_EDITOR 1092 +#define IMG_CUSTOM_167 1093 +#define IMG_CUSTOM_167_EDITOR 1094 +#define IMG_CUSTOM_168 1095 +#define IMG_CUSTOM_168_EDITOR 1096 +#define IMG_CUSTOM_169 1097 +#define IMG_CUSTOM_169_EDITOR 1098 +#define IMG_CUSTOM_170 1099 +#define IMG_CUSTOM_170_EDITOR 1100 +#define IMG_CUSTOM_171 1101 +#define IMG_CUSTOM_171_EDITOR 1102 +#define IMG_CUSTOM_172 1103 +#define IMG_CUSTOM_172_EDITOR 1104 +#define IMG_CUSTOM_173 1105 +#define IMG_CUSTOM_173_EDITOR 1106 +#define IMG_CUSTOM_174 1107 +#define IMG_CUSTOM_174_EDITOR 1108 +#define IMG_CUSTOM_175 1109 +#define IMG_CUSTOM_175_EDITOR 1110 +#define IMG_CUSTOM_176 1111 +#define IMG_CUSTOM_176_EDITOR 1112 +#define IMG_CUSTOM_177 1113 +#define IMG_CUSTOM_177_EDITOR 1114 +#define IMG_CUSTOM_178 1115 +#define IMG_CUSTOM_178_EDITOR 1116 +#define IMG_CUSTOM_179 1117 +#define IMG_CUSTOM_179_EDITOR 1118 +#define IMG_CUSTOM_180 1119 +#define IMG_CUSTOM_180_EDITOR 1120 +#define IMG_CUSTOM_181 1121 +#define IMG_CUSTOM_181_EDITOR 1122 +#define IMG_CUSTOM_182 1123 +#define IMG_CUSTOM_182_EDITOR 1124 +#define IMG_CUSTOM_183 1125 +#define IMG_CUSTOM_183_EDITOR 1126 +#define IMG_CUSTOM_184 1127 +#define IMG_CUSTOM_184_EDITOR 1128 +#define IMG_CUSTOM_185 1129 +#define IMG_CUSTOM_185_EDITOR 1130 +#define IMG_CUSTOM_186 1131 +#define IMG_CUSTOM_186_EDITOR 1132 +#define IMG_CUSTOM_187 1133 +#define IMG_CUSTOM_187_EDITOR 1134 +#define IMG_CUSTOM_188 1135 +#define IMG_CUSTOM_188_EDITOR 1136 +#define IMG_CUSTOM_189 1137 +#define IMG_CUSTOM_189_EDITOR 1138 +#define IMG_CUSTOM_190 1139 +#define IMG_CUSTOM_190_EDITOR 1140 +#define IMG_CUSTOM_191 1141 +#define IMG_CUSTOM_191_EDITOR 1142 +#define IMG_CUSTOM_192 1143 +#define IMG_CUSTOM_192_EDITOR 1144 +#define IMG_CUSTOM_193 1145 +#define IMG_CUSTOM_193_EDITOR 1146 +#define IMG_CUSTOM_194 1147 +#define IMG_CUSTOM_194_EDITOR 1148 +#define IMG_CUSTOM_195 1149 +#define IMG_CUSTOM_195_EDITOR 1150 +#define IMG_CUSTOM_196 1151 +#define IMG_CUSTOM_196_EDITOR 1152 +#define IMG_CUSTOM_197 1153 +#define IMG_CUSTOM_197_EDITOR 1154 +#define IMG_CUSTOM_198 1155 +#define IMG_CUSTOM_198_EDITOR 1156 +#define IMG_CUSTOM_199 1157 +#define IMG_CUSTOM_199_EDITOR 1158 +#define IMG_CUSTOM_200 1159 +#define IMG_CUSTOM_200_EDITOR 1160 +#define IMG_CUSTOM_201 1161 +#define IMG_CUSTOM_201_EDITOR 1162 +#define IMG_CUSTOM_202 1163 +#define IMG_CUSTOM_202_EDITOR 1164 +#define IMG_CUSTOM_203 1165 +#define IMG_CUSTOM_203_EDITOR 1166 +#define IMG_CUSTOM_204 1167 +#define IMG_CUSTOM_204_EDITOR 1168 +#define IMG_CUSTOM_205 1169 +#define IMG_CUSTOM_205_EDITOR 1170 +#define IMG_CUSTOM_206 1171 +#define IMG_CUSTOM_206_EDITOR 1172 +#define IMG_CUSTOM_207 1173 +#define IMG_CUSTOM_207_EDITOR 1174 +#define IMG_CUSTOM_208 1175 +#define IMG_CUSTOM_208_EDITOR 1176 +#define IMG_CUSTOM_209 1177 +#define IMG_CUSTOM_209_EDITOR 1178 +#define IMG_CUSTOM_210 1179 +#define IMG_CUSTOM_210_EDITOR 1180 +#define IMG_CUSTOM_211 1181 +#define IMG_CUSTOM_211_EDITOR 1182 +#define IMG_CUSTOM_212 1183 +#define IMG_CUSTOM_212_EDITOR 1184 +#define IMG_CUSTOM_213 1185 +#define IMG_CUSTOM_213_EDITOR 1186 +#define IMG_CUSTOM_214 1187 +#define IMG_CUSTOM_214_EDITOR 1188 +#define IMG_CUSTOM_215 1189 +#define IMG_CUSTOM_215_EDITOR 1190 +#define IMG_CUSTOM_216 1191 +#define IMG_CUSTOM_216_EDITOR 1192 +#define IMG_CUSTOM_217 1193 +#define IMG_CUSTOM_217_EDITOR 1194 +#define IMG_CUSTOM_218 1195 +#define IMG_CUSTOM_218_EDITOR 1196 +#define IMG_CUSTOM_219 1197 +#define IMG_CUSTOM_219_EDITOR 1198 +#define IMG_CUSTOM_220 1199 +#define IMG_CUSTOM_220_EDITOR 1200 +#define IMG_CUSTOM_221 1201 +#define IMG_CUSTOM_221_EDITOR 1202 +#define IMG_CUSTOM_222 1203 +#define IMG_CUSTOM_222_EDITOR 1204 +#define IMG_CUSTOM_223 1205 +#define IMG_CUSTOM_223_EDITOR 1206 +#define IMG_CUSTOM_224 1207 +#define IMG_CUSTOM_224_EDITOR 1208 +#define IMG_CUSTOM_225 1209 +#define IMG_CUSTOM_225_EDITOR 1210 +#define IMG_CUSTOM_226 1211 +#define IMG_CUSTOM_226_EDITOR 1212 +#define IMG_CUSTOM_227 1213 +#define IMG_CUSTOM_227_EDITOR 1214 +#define IMG_CUSTOM_228 1215 +#define IMG_CUSTOM_228_EDITOR 1216 +#define IMG_CUSTOM_229 1217 +#define IMG_CUSTOM_229_EDITOR 1218 +#define IMG_CUSTOM_230 1219 +#define IMG_CUSTOM_230_EDITOR 1220 +#define IMG_CUSTOM_231 1221 +#define IMG_CUSTOM_231_EDITOR 1222 +#define IMG_CUSTOM_232 1223 +#define IMG_CUSTOM_232_EDITOR 1224 +#define IMG_CUSTOM_233 1225 +#define IMG_CUSTOM_233_EDITOR 1226 +#define IMG_CUSTOM_234 1227 +#define IMG_CUSTOM_234_EDITOR 1228 +#define IMG_CUSTOM_235 1229 +#define IMG_CUSTOM_235_EDITOR 1230 +#define IMG_CUSTOM_236 1231 +#define IMG_CUSTOM_236_EDITOR 1232 +#define IMG_CUSTOM_237 1233 +#define IMG_CUSTOM_237_EDITOR 1234 +#define IMG_CUSTOM_238 1235 +#define IMG_CUSTOM_238_EDITOR 1236 +#define IMG_CUSTOM_239 1237 +#define IMG_CUSTOM_239_EDITOR 1238 +#define IMG_CUSTOM_240 1239 +#define IMG_CUSTOM_240_EDITOR 1240 +#define IMG_CUSTOM_241 1241 +#define IMG_CUSTOM_241_EDITOR 1242 +#define IMG_CUSTOM_242 1243 +#define IMG_CUSTOM_242_EDITOR 1244 +#define IMG_CUSTOM_243 1245 +#define IMG_CUSTOM_243_EDITOR 1246 +#define IMG_CUSTOM_244 1247 +#define IMG_CUSTOM_244_EDITOR 1248 +#define IMG_CUSTOM_245 1249 +#define IMG_CUSTOM_245_EDITOR 1250 +#define IMG_CUSTOM_246 1251 +#define IMG_CUSTOM_246_EDITOR 1252 +#define IMG_CUSTOM_247 1253 +#define IMG_CUSTOM_247_EDITOR 1254 +#define IMG_CUSTOM_248 1255 +#define IMG_CUSTOM_248_EDITOR 1256 +#define IMG_CUSTOM_249 1257 +#define IMG_CUSTOM_249_EDITOR 1258 +#define IMG_CUSTOM_250 1259 +#define IMG_CUSTOM_250_EDITOR 1260 +#define IMG_CUSTOM_251 1261 +#define IMG_CUSTOM_251_EDITOR 1262 +#define IMG_CUSTOM_252 1263 +#define IMG_CUSTOM_252_EDITOR 1264 +#define IMG_CUSTOM_253 1265 +#define IMG_CUSTOM_253_EDITOR 1266 +#define IMG_CUSTOM_254 1267 +#define IMG_CUSTOM_254_EDITOR 1268 +#define IMG_CUSTOM_255 1269 +#define IMG_CUSTOM_255_EDITOR 1270 +#define IMG_CUSTOM_256 1271 +#define IMG_CUSTOM_256_EDITOR 1272 +#define IMG_GROUP_1 1273 +#define IMG_GROUP_1_EDITOR 1274 +#define IMG_GROUP_2 1275 +#define IMG_GROUP_2_EDITOR 1276 +#define IMG_GROUP_3 1277 +#define IMG_GROUP_3_EDITOR 1278 +#define IMG_GROUP_4 1279 +#define IMG_GROUP_4_EDITOR 1280 +#define IMG_GROUP_5 1281 +#define IMG_GROUP_5_EDITOR 1282 +#define IMG_GROUP_6 1283 +#define IMG_GROUP_6_EDITOR 1284 +#define IMG_GROUP_7 1285 +#define IMG_GROUP_7_EDITOR 1286 +#define IMG_GROUP_8 1287 +#define IMG_GROUP_8_EDITOR 1288 +#define IMG_GROUP_9 1289 +#define IMG_GROUP_9_EDITOR 1290 +#define IMG_GROUP_10 1291 +#define IMG_GROUP_10_EDITOR 1292 +#define IMG_GROUP_11 1293 +#define IMG_GROUP_11_EDITOR 1294 +#define IMG_GROUP_12 1295 +#define IMG_GROUP_12_EDITOR 1296 +#define IMG_GROUP_13 1297 +#define IMG_GROUP_13_EDITOR 1298 +#define IMG_GROUP_14 1299 +#define IMG_GROUP_14_EDITOR 1300 +#define IMG_GROUP_15 1301 +#define IMG_GROUP_15_EDITOR 1302 +#define IMG_GROUP_16 1303 +#define IMG_GROUP_16_EDITOR 1304 +#define IMG_GROUP_17 1305 +#define IMG_GROUP_17_EDITOR 1306 +#define IMG_GROUP_18 1307 +#define IMG_GROUP_18_EDITOR 1308 +#define IMG_GROUP_19 1309 +#define IMG_GROUP_19_EDITOR 1310 +#define IMG_GROUP_20 1311 +#define IMG_GROUP_20_EDITOR 1312 +#define IMG_GROUP_21 1313 +#define IMG_GROUP_21_EDITOR 1314 +#define IMG_GROUP_22 1315 +#define IMG_GROUP_22_EDITOR 1316 +#define IMG_GROUP_23 1317 +#define IMG_GROUP_23_EDITOR 1318 +#define IMG_GROUP_24 1319 +#define IMG_GROUP_24_EDITOR 1320 +#define IMG_GROUP_25 1321 +#define IMG_GROUP_25_EDITOR 1322 +#define IMG_GROUP_26 1323 +#define IMG_GROUP_26_EDITOR 1324 +#define IMG_GROUP_27 1325 +#define IMG_GROUP_27_EDITOR 1326 +#define IMG_GROUP_28 1327 +#define IMG_GROUP_28_EDITOR 1328 +#define IMG_GROUP_29 1329 +#define IMG_GROUP_29_EDITOR 1330 +#define IMG_GROUP_30 1331 +#define IMG_GROUP_30_EDITOR 1332 +#define IMG_GROUP_31 1333 +#define IMG_GROUP_31_EDITOR 1334 +#define IMG_GROUP_32 1335 +#define IMG_GROUP_32_EDITOR 1336 +#define IMG_EMC_OBJECT 1337 +#define IMG_EMC_SPRITE 1338 +#define IMG_TOON_1 1339 +#define IMG_TOON_2 1340 +#define IMG_TOON_3 1341 +#define IMG_TOON_4 1342 +#define IMG_TOON_5 1343 +#define IMG_TOON_6 1344 +#define IMG_TOON_7 1345 +#define IMG_TOON_8 1346 +#define IMG_TOON_9 1347 +#define IMG_TOON_10 1348 +#define IMG_TOON_11 1349 +#define IMG_TOON_12 1350 +#define IMG_TOON_13 1351 +#define IMG_TOON_14 1352 +#define IMG_TOON_15 1353 +#define IMG_TOON_16 1354 +#define IMG_TOON_17 1355 +#define IMG_TOON_18 1356 +#define IMG_TOON_19 1357 +#define IMG_TOON_20 1358 +#define IMG_MENU_CALIBRATE_RED 1359 +#define IMG_MENU_CALIBRATE_BLUE 1360 +#define IMG_MENU_CALIBRATE_YELLOW 1361 +#define IMG_MENU_BUTTON 1362 +#define IMG_MENU_BUTTON_ACTIVE 1363 +#define IMG_MENU_BUTTON_LEFT 1364 +#define IMG_MENU_BUTTON_RIGHT 1365 +#define IMG_MENU_BUTTON_UP 1366 +#define IMG_MENU_BUTTON_DOWN 1367 +#define IMG_MENU_BUTTON_LEFT_ACTIVE 1368 +#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1369 +#define IMG_MENU_BUTTON_UP_ACTIVE 1370 +#define IMG_MENU_BUTTON_DOWN_ACTIVE 1371 +#define IMG_MENU_SCROLLBAR 1372 +#define IMG_MENU_SCROLLBAR_ACTIVE 1373 +#define IMG_FONT_INITIAL_1 1374 +#define IMG_FONT_INITIAL_2 1375 +#define IMG_FONT_INITIAL_3 1376 +#define IMG_FONT_INITIAL_4 1377 +#define IMG_FONT_TITLE_1 1378 +#define IMG_FONT_TITLE_1_LEVELS 1379 +#define IMG_FONT_TITLE_2 1380 +#define IMG_FONT_MENU_1 1381 +#define IMG_FONT_MENU_2 1382 +#define IMG_FONT_TEXT_1 1383 +#define IMG_FONT_TEXT_1_LEVELS 1384 +#define IMG_FONT_TEXT_1_PREVIEW 1385 +#define IMG_FONT_TEXT_1_SCORES 1386 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1387 +#define IMG_FONT_TEXT_2 1388 +#define IMG_FONT_TEXT_2_LEVELS 1389 +#define IMG_FONT_TEXT_2_PREVIEW 1390 +#define IMG_FONT_TEXT_2_SCORES 1391 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1392 +#define IMG_FONT_TEXT_3 1393 +#define IMG_FONT_TEXT_3_LEVELS 1394 +#define IMG_FONT_TEXT_3_PREVIEW 1395 +#define IMG_FONT_TEXT_3_SCORES 1396 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1397 +#define IMG_FONT_TEXT_4 1398 +#define IMG_FONT_TEXT_4_LEVELS 1399 +#define IMG_FONT_TEXT_4_SCORES 1400 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1401 +#define IMG_FONT_ENVELOPE_1 1402 +#define IMG_FONT_ENVELOPE_2 1403 +#define IMG_FONT_ENVELOPE_3 1404 +#define IMG_FONT_ENVELOPE_4 1405 +#define IMG_FONT_INPUT_1 1406 +#define IMG_FONT_INPUT_1_MAIN 1407 +#define IMG_FONT_INPUT_1_ACTIVE 1408 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1409 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1410 +#define IMG_FONT_INPUT_2 1411 +#define IMG_FONT_INPUT_2_ACTIVE 1412 +#define IMG_FONT_OPTION_OFF 1413 +#define IMG_FONT_OPTION_ON 1414 +#define IMG_FONT_VALUE_1 1415 +#define IMG_FONT_VALUE_2 1416 +#define IMG_FONT_VALUE_OLD 1417 +#define IMG_FONT_LEVEL_NUMBER 1418 +#define IMG_FONT_TAPE_RECORDER 1419 +#define IMG_FONT_GAME_INFO 1420 +#define IMG_GLOBAL_BORDER 1421 +#define IMG_GLOBAL_DOOR 1422 +#define IMG_EDITOR_ELEMENT_BORDER 1423 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1424 +#define IMG_BACKGROUND_ENVELOPE_1 1425 +#define IMG_BACKGROUND_ENVELOPE_2 1426 +#define IMG_BACKGROUND_ENVELOPE_3 1427 +#define IMG_BACKGROUND_ENVELOPE_4 1428 +#define IMG_BACKGROUND 1429 +#define IMG_BACKGROUND_MAIN 1430 +#define IMG_BACKGROUND_LEVELS 1431 +#define IMG_BACKGROUND_SCORES 1432 +#define IMG_BACKGROUND_EDITOR 1433 +#define IMG_BACKGROUND_INFO 1434 +#define IMG_BACKGROUND_INFO_ELEMENTS 1435 +#define IMG_BACKGROUND_SETUP 1436 +#define IMG_BACKGROUND_DOOR 1437 -#define NUM_IMAGE_FILES 1437 +#define NUM_IMAGE_FILES 1438 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index d82c25c3..0c989716 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2004-10-01 03:17]" +#define COMPILE_DATE_STRING "[2004-10-04 22:13]" diff --git a/src/editor.c b/src/editor.c index c33f9873..e18486e9 100644 --- a/src/editor.c +++ b/src/editor.c @@ -151,6 +151,12 @@ #define ED_AREA_YAMYAM_CONTENT_YPOS(n) (17 * MINI_TILEY + \ 6 * ((n) / 4) * MINI_TILEY) +/* magic ball content */ +#define ED_AREA_MAGIC_BALL_CONTENT_XPOS(n) (2 * MINI_TILEX + \ + 5 * ((n) % 4) * MINI_TILEX) +#define ED_AREA_MAGIC_BALL_CONTENT_YPOS(n) (17 * MINI_TILEY + \ + 6 * ((n) / 4) * MINI_TILEY) + /* values for scrolling gadgets for drawing area */ #define ED_SCROLLBUTTON_XPOS 24 #define ED_SCROLLBUTTON_YPOS 0 @@ -334,86 +340,97 @@ #define GADGET_ID_LEVEL_TIMESCORE_DOWN (GADGET_ID_COUNTER_FIRST + 18) #define GADGET_ID_LEVEL_TIMESCORE_TEXT (GADGET_ID_COUNTER_FIRST + 19) #define GADGET_ID_LEVEL_TIMESCORE_UP (GADGET_ID_COUNTER_FIRST + 20) -#define GADGET_ID_ELEMENT_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 21) -#define GADGET_ID_ELEMENT_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 22) -#define GADGET_ID_ELEMENT_SCORE_UP (GADGET_ID_COUNTER_FIRST + 23) -#define GADGET_ID_ELEMENT_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 24) -#define GADGET_ID_ELEMENT_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 25) -#define GADGET_ID_ELEMENT_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 26) -#define GADGET_ID_ENVELOPE_XSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 27) -#define GADGET_ID_ENVELOPE_XSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 28) -#define GADGET_ID_ENVELOPE_XSIZE_UP (GADGET_ID_COUNTER_FIRST + 29) -#define GADGET_ID_ENVELOPE_YSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 30) -#define GADGET_ID_ENVELOPE_YSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 31) -#define GADGET_ID_ENVELOPE_YSIZE_UP (GADGET_ID_COUNTER_FIRST + 32) -#define GADGET_ID_CUSTOM_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 33) -#define GADGET_ID_CUSTOM_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 34) -#define GADGET_ID_CUSTOM_SCORE_UP (GADGET_ID_COUNTER_FIRST + 35) -#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 36) -#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 37) -#define GADGET_ID_CUSTOM_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 38) -#define GADGET_ID_PUSH_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 39) -#define GADGET_ID_PUSH_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 40) -#define GADGET_ID_PUSH_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 41) -#define GADGET_ID_PUSH_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 42) -#define GADGET_ID_PUSH_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 43) -#define GADGET_ID_PUSH_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 44) -#define GADGET_ID_DROP_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 45) -#define GADGET_ID_DROP_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 46) -#define GADGET_ID_DROP_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 47) -#define GADGET_ID_DROP_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 48) -#define GADGET_ID_DROP_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 49) -#define GADGET_ID_DROP_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 50) -#define GADGET_ID_MOVE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 51) -#define GADGET_ID_MOVE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 52) -#define GADGET_ID_MOVE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 53) -#define GADGET_ID_MOVE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 54) -#define GADGET_ID_MOVE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 55) -#define GADGET_ID_MOVE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 56) -#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 57) -#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 58) -#define GADGET_ID_EXPLOSION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 59) -#define GADGET_ID_IGNITION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 60) -#define GADGET_ID_IGNITION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 61) -#define GADGET_ID_IGNITION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 62) -#define GADGET_ID_CHANGE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 63) -#define GADGET_ID_CHANGE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 64) -#define GADGET_ID_CHANGE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 65) -#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 66) -#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 67) -#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 68) -#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 69) -#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 70) -#define GADGET_ID_CHANGE_CONT_RND_UP (GADGET_ID_COUNTER_FIRST + 71) -#define GADGET_ID_GROUP_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 72) -#define GADGET_ID_GROUP_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 73) -#define GADGET_ID_GROUP_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 74) +#define GADGET_ID_ELEMENT_VALUE1_DOWN (GADGET_ID_COUNTER_FIRST + 21) +#define GADGET_ID_ELEMENT_VALUE1_TEXT (GADGET_ID_COUNTER_FIRST + 22) +#define GADGET_ID_ELEMENT_VALUE1_UP (GADGET_ID_COUNTER_FIRST + 23) +#define GADGET_ID_ELEMENT_VALUE2_DOWN (GADGET_ID_COUNTER_FIRST + 24) +#define GADGET_ID_ELEMENT_VALUE2_TEXT (GADGET_ID_COUNTER_FIRST + 25) +#define GADGET_ID_ELEMENT_VALUE2_UP (GADGET_ID_COUNTER_FIRST + 26) +#define GADGET_ID_YAMYAM_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 27) +#define GADGET_ID_YAMYAM_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 28) +#define GADGET_ID_YAMYAM_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 29) +#define GADGET_ID_ENVELOPE_XSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 30) +#define GADGET_ID_ENVELOPE_XSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 31) +#define GADGET_ID_ENVELOPE_XSIZE_UP (GADGET_ID_COUNTER_FIRST + 32) +#define GADGET_ID_ENVELOPE_YSIZE_DOWN (GADGET_ID_COUNTER_FIRST + 33) +#define GADGET_ID_ENVELOPE_YSIZE_TEXT (GADGET_ID_COUNTER_FIRST + 34) +#define GADGET_ID_ENVELOPE_YSIZE_UP (GADGET_ID_COUNTER_FIRST + 35) +#define GADGET_ID_CUSTOM_SCORE_DOWN (GADGET_ID_COUNTER_FIRST + 36) +#define GADGET_ID_CUSTOM_SCORE_TEXT (GADGET_ID_COUNTER_FIRST + 37) +#define GADGET_ID_CUSTOM_SCORE_UP (GADGET_ID_COUNTER_FIRST + 38) +#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 39) +#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 40) +#define GADGET_ID_CUSTOM_GEMCOUNT_UP (GADGET_ID_COUNTER_FIRST + 41) +#define GADGET_ID_PUSH_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 42) +#define GADGET_ID_PUSH_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 43) +#define GADGET_ID_PUSH_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 44) +#define GADGET_ID_PUSH_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 45) +#define GADGET_ID_PUSH_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 46) +#define GADGET_ID_PUSH_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 47) +#define GADGET_ID_DROP_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 48) +#define GADGET_ID_DROP_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 49) +#define GADGET_ID_DROP_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 50) +#define GADGET_ID_DROP_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 51) +#define GADGET_ID_DROP_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 52) +#define GADGET_ID_DROP_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 53) +#define GADGET_ID_MOVE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 54) +#define GADGET_ID_MOVE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 55) +#define GADGET_ID_MOVE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 56) +#define GADGET_ID_MOVE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 57) +#define GADGET_ID_MOVE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 58) +#define GADGET_ID_MOVE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 59) +#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 60) +#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 61) +#define GADGET_ID_EXPLOSION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 62) +#define GADGET_ID_IGNITION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 63) +#define GADGET_ID_IGNITION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 64) +#define GADGET_ID_IGNITION_DELAY_UP (GADGET_ID_COUNTER_FIRST + 65) +#define GADGET_ID_CHANGE_DELAY_FIX_DOWN (GADGET_ID_COUNTER_FIRST + 66) +#define GADGET_ID_CHANGE_DELAY_FIX_TEXT (GADGET_ID_COUNTER_FIRST + 67) +#define GADGET_ID_CHANGE_DELAY_FIX_UP (GADGET_ID_COUNTER_FIRST + 68) +#define GADGET_ID_CHANGE_DELAY_RND_DOWN (GADGET_ID_COUNTER_FIRST + 69) +#define GADGET_ID_CHANGE_DELAY_RND_TEXT (GADGET_ID_COUNTER_FIRST + 70) +#define GADGET_ID_CHANGE_DELAY_RND_UP (GADGET_ID_COUNTER_FIRST + 71) +#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 72) +#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 73) +#define GADGET_ID_CHANGE_CONT_RND_UP (GADGET_ID_COUNTER_FIRST + 74) +#define GADGET_ID_GROUP_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 75) +#define GADGET_ID_GROUP_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 76) +#define GADGET_ID_GROUP_CONTENT_UP (GADGET_ID_COUNTER_FIRST + 77) /* drawing area identifiers */ -#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 75) +#define GADGET_ID_DRAWING_AREA_FIRST (GADGET_ID_COUNTER_FIRST + 78) #define GADGET_ID_DRAWING_LEVEL (GADGET_ID_DRAWING_AREA_FIRST + 0) -#define GADGET_ID_ELEMENT_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 1) -#define GADGET_ID_ELEMENT_CONTENT_1 (GADGET_ID_DRAWING_AREA_FIRST + 2) -#define GADGET_ID_ELEMENT_CONTENT_2 (GADGET_ID_DRAWING_AREA_FIRST + 3) -#define GADGET_ID_ELEMENT_CONTENT_3 (GADGET_ID_DRAWING_AREA_FIRST + 4) -#define GADGET_ID_ELEMENT_CONTENT_4 (GADGET_ID_DRAWING_AREA_FIRST + 5) -#define GADGET_ID_ELEMENT_CONTENT_5 (GADGET_ID_DRAWING_AREA_FIRST + 6) -#define GADGET_ID_ELEMENT_CONTENT_6 (GADGET_ID_DRAWING_AREA_FIRST + 7) -#define GADGET_ID_ELEMENT_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 8) -#define GADGET_ID_AMOEBA_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 9) -#define GADGET_ID_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 10) -#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 11) -#define GADGET_ID_CUSTOM_MOVE_ENTER (GADGET_ID_DRAWING_AREA_FIRST + 12) -#define GADGET_ID_CUSTOM_MOVE_LEAVE (GADGET_ID_DRAWING_AREA_FIRST + 13) -#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 14) -#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 15) -#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 16) -#define GADGET_ID_GROUP_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 17) -#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 18) +#define GADGET_ID_YAMYAM_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 1) +#define GADGET_ID_YAMYAM_CONTENT_1 (GADGET_ID_DRAWING_AREA_FIRST + 2) +#define GADGET_ID_YAMYAM_CONTENT_2 (GADGET_ID_DRAWING_AREA_FIRST + 3) +#define GADGET_ID_YAMYAM_CONTENT_3 (GADGET_ID_DRAWING_AREA_FIRST + 4) +#define GADGET_ID_YAMYAM_CONTENT_4 (GADGET_ID_DRAWING_AREA_FIRST + 5) +#define GADGET_ID_YAMYAM_CONTENT_5 (GADGET_ID_DRAWING_AREA_FIRST + 6) +#define GADGET_ID_YAMYAM_CONTENT_6 (GADGET_ID_DRAWING_AREA_FIRST + 7) +#define GADGET_ID_YAMYAM_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 8) +#define GADGET_ID_MAGIC_BALL_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 9) +#define GADGET_ID_MAGIC_BALL_CONTENT_1 (GADGET_ID_DRAWING_AREA_FIRST + 10) +#define GADGET_ID_MAGIC_BALL_CONTENT_2 (GADGET_ID_DRAWING_AREA_FIRST + 11) +#define GADGET_ID_MAGIC_BALL_CONTENT_3 (GADGET_ID_DRAWING_AREA_FIRST + 12) +#define GADGET_ID_MAGIC_BALL_CONTENT_4 (GADGET_ID_DRAWING_AREA_FIRST + 13) +#define GADGET_ID_MAGIC_BALL_CONTENT_5 (GADGET_ID_DRAWING_AREA_FIRST + 14) +#define GADGET_ID_MAGIC_BALL_CONTENT_6 (GADGET_ID_DRAWING_AREA_FIRST + 15) +#define GADGET_ID_MAGIC_BALL_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 16) +#define GADGET_ID_AMOEBA_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 17) +#define GADGET_ID_CUSTOM_GRAPHIC (GADGET_ID_DRAWING_AREA_FIRST + 18) +#define GADGET_ID_CUSTOM_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 19) +#define GADGET_ID_CUSTOM_MOVE_ENTER (GADGET_ID_DRAWING_AREA_FIRST + 20) +#define GADGET_ID_CUSTOM_MOVE_LEAVE (GADGET_ID_DRAWING_AREA_FIRST + 21) +#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 22) +#define GADGET_ID_CUSTOM_CHANGE_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 23) +#define GADGET_ID_CUSTOM_CHANGE_TRIGGER (GADGET_ID_DRAWING_AREA_FIRST + 24) +#define GADGET_ID_GROUP_CONTENT (GADGET_ID_DRAWING_AREA_FIRST + 25) +#define GADGET_ID_RANDOM_BACKGROUND (GADGET_ID_DRAWING_AREA_FIRST + 26) /* text input identifiers */ -#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 19) +#define GADGET_ID_TEXT_INPUT_FIRST (GADGET_ID_DRAWING_AREA_FIRST + 27) #define GADGET_ID_LEVEL_NAME (GADGET_ID_TEXT_INPUT_FIRST + 0) #define GADGET_ID_LEVEL_AUTHOR (GADGET_ID_TEXT_INPUT_FIRST + 1) @@ -552,26 +569,27 @@ #define ED_COUNTER_ID_LEVEL_TIMELIMIT 4 #define ED_COUNTER_ID_LEVEL_TIMESCORE 5 #define ED_COUNTER_ID_LEVEL_RANDOM 6 -#define ED_COUNTER_ID_ELEMENT_SCORE 7 -#define ED_COUNTER_ID_ELEMENT_CONTENT 8 -#define ED_COUNTER_ID_ENVELOPE_XSIZE 9 -#define ED_COUNTER_ID_ENVELOPE_YSIZE 10 -#define ED_COUNTER_ID_CUSTOM_SCORE 11 -#define ED_COUNTER_ID_CUSTOM_GEMCOUNT 12 -#define ED_COUNTER_ID_PUSH_DELAY_FIX 13 -#define ED_COUNTER_ID_PUSH_DELAY_RND 14 -#define ED_COUNTER_ID_DROP_DELAY_FIX 15 -#define ED_COUNTER_ID_DROP_DELAY_RND 16 -#define ED_COUNTER_ID_MOVE_DELAY_FIX 17 -#define ED_COUNTER_ID_MOVE_DELAY_RND 18 -#define ED_COUNTER_ID_EXPLOSION_DELAY 19 -#define ED_COUNTER_ID_IGNITION_DELAY 20 -#define ED_COUNTER_ID_GROUP_CONTENT 21 -#define ED_COUNTER_ID_CHANGE_DELAY_FIX 22 -#define ED_COUNTER_ID_CHANGE_DELAY_RND 23 -#define ED_COUNTER_ID_CHANGE_CONT_RND 24 - -#define ED_NUM_COUNTERBUTTONS 25 +#define ED_COUNTER_ID_ELEMENT_VALUE1 7 +#define ED_COUNTER_ID_ELEMENT_VALUE2 8 +#define ED_COUNTER_ID_YAMYAM_CONTENT 9 +#define ED_COUNTER_ID_ENVELOPE_XSIZE 10 +#define ED_COUNTER_ID_ENVELOPE_YSIZE 11 +#define ED_COUNTER_ID_CUSTOM_SCORE 12 +#define ED_COUNTER_ID_CUSTOM_GEMCOUNT 13 +#define ED_COUNTER_ID_PUSH_DELAY_FIX 14 +#define ED_COUNTER_ID_PUSH_DELAY_RND 15 +#define ED_COUNTER_ID_DROP_DELAY_FIX 16 +#define ED_COUNTER_ID_DROP_DELAY_RND 17 +#define ED_COUNTER_ID_MOVE_DELAY_FIX 18 +#define ED_COUNTER_ID_MOVE_DELAY_RND 19 +#define ED_COUNTER_ID_EXPLOSION_DELAY 20 +#define ED_COUNTER_ID_IGNITION_DELAY 21 +#define ED_COUNTER_ID_GROUP_CONTENT 22 +#define ED_COUNTER_ID_CHANGE_DELAY_FIX 23 +#define ED_COUNTER_ID_CHANGE_DELAY_RND 24 +#define ED_COUNTER_ID_CHANGE_CONT_RND 25 + +#define ED_NUM_COUNTERBUTTONS 26 #define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE #define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM @@ -762,26 +780,34 @@ /* values for drawing area gadgets */ #define ED_DRAWING_ID_DRAWING_LEVEL 0 -#define ED_DRAWING_ID_ELEMENT_CONTENT_0 1 -#define ED_DRAWING_ID_ELEMENT_CONTENT_1 2 -#define ED_DRAWING_ID_ELEMENT_CONTENT_2 3 -#define ED_DRAWING_ID_ELEMENT_CONTENT_3 4 -#define ED_DRAWING_ID_ELEMENT_CONTENT_4 5 -#define ED_DRAWING_ID_ELEMENT_CONTENT_5 6 -#define ED_DRAWING_ID_ELEMENT_CONTENT_6 7 -#define ED_DRAWING_ID_ELEMENT_CONTENT_7 8 -#define ED_DRAWING_ID_AMOEBA_CONTENT 9 -#define ED_DRAWING_ID_CUSTOM_GRAPHIC 10 -#define ED_DRAWING_ID_CUSTOM_CONTENT 11 -#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER 12 -#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE 13 -#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET 14 -#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT 15 -#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER 16 -#define ED_DRAWING_ID_GROUP_CONTENT 17 -#define ED_DRAWING_ID_RANDOM_BACKGROUND 18 - -#define ED_NUM_DRAWING_AREAS 19 +#define ED_DRAWING_ID_YAMYAM_CONTENT_0 1 +#define ED_DRAWING_ID_YAMYAM_CONTENT_1 2 +#define ED_DRAWING_ID_YAMYAM_CONTENT_2 3 +#define ED_DRAWING_ID_YAMYAM_CONTENT_3 4 +#define ED_DRAWING_ID_YAMYAM_CONTENT_4 5 +#define ED_DRAWING_ID_YAMYAM_CONTENT_5 6 +#define ED_DRAWING_ID_YAMYAM_CONTENT_6 7 +#define ED_DRAWING_ID_YAMYAM_CONTENT_7 8 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_0 9 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_1 10 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_2 11 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_3 12 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_4 13 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_5 14 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_6 15 +#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_7 16 +#define ED_DRAWING_ID_AMOEBA_CONTENT 17 +#define ED_DRAWING_ID_CUSTOM_GRAPHIC 18 +#define ED_DRAWING_ID_CUSTOM_CONTENT 19 +#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER 20 +#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE 21 +#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET 22 +#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT 23 +#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER 24 +#define ED_DRAWING_ID_GROUP_CONTENT 25 +#define ED_DRAWING_ID_RANDOM_BACKGROUND 26 + +#define ED_NUM_DRAWING_AREAS 27 /* @@ -963,16 +989,24 @@ static struct { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(0), MIN_SCORE, MAX_SCORE, - GADGET_ID_ELEMENT_SCORE_DOWN, GADGET_ID_ELEMENT_SCORE_UP, - GADGET_ID_ELEMENT_SCORE_TEXT, GADGET_ID_NONE, + GADGET_ID_ELEMENT_VALUE1_DOWN, GADGET_ID_ELEMENT_VALUE1_UP, + GADGET_ID_ELEMENT_VALUE1_TEXT, GADGET_ID_NONE, + NULL, /* will be set when used */ + NULL, NULL, NULL + }, + { + ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(1), + MIN_SCORE, MAX_SCORE, + GADGET_ID_ELEMENT_VALUE2_DOWN, GADGET_ID_ELEMENT_VALUE2_UP, + GADGET_ID_ELEMENT_VALUE2_TEXT, GADGET_ID_NONE, NULL, /* will be set when used */ NULL, NULL, NULL }, { ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(3), MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS, - GADGET_ID_ELEMENT_CONTENT_DOWN, GADGET_ID_ELEMENT_CONTENT_UP, - GADGET_ID_ELEMENT_CONTENT_TEXT, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_DOWN, GADGET_ID_YAMYAM_CONTENT_UP, + GADGET_ID_YAMYAM_CONTENT_TEXT, GADGET_ID_NONE, &level.num_yamyam_contents, NULL, NULL, "number of content areas" }, @@ -2230,49 +2264,100 @@ static struct { ED_AREA_YAMYAM_CONTENT_XPOS(0), ED_AREA_YAMYAM_CONTENT_YPOS(0), 3, 3, - GADGET_ID_ELEMENT_CONTENT_0, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_0, GADGET_ID_NONE, NULL, NULL, "1" }, { ED_AREA_YAMYAM_CONTENT_XPOS(1), ED_AREA_YAMYAM_CONTENT_YPOS(1), 3, 3, - GADGET_ID_ELEMENT_CONTENT_1, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_1, GADGET_ID_NONE, NULL, NULL, "2" }, { ED_AREA_YAMYAM_CONTENT_XPOS(2), ED_AREA_YAMYAM_CONTENT_YPOS(2), 3, 3, - GADGET_ID_ELEMENT_CONTENT_2, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_2, GADGET_ID_NONE, NULL, NULL, "3" }, { ED_AREA_YAMYAM_CONTENT_XPOS(3), ED_AREA_YAMYAM_CONTENT_YPOS(3), 3, 3, - GADGET_ID_ELEMENT_CONTENT_3, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_3, GADGET_ID_NONE, NULL, NULL, "4" }, { ED_AREA_YAMYAM_CONTENT_XPOS(4), ED_AREA_YAMYAM_CONTENT_YPOS(4), 3, 3, - GADGET_ID_ELEMENT_CONTENT_4, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_4, GADGET_ID_NONE, NULL, NULL, "5" }, { ED_AREA_YAMYAM_CONTENT_XPOS(5), ED_AREA_YAMYAM_CONTENT_YPOS(5), 3, 3, - GADGET_ID_ELEMENT_CONTENT_5, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_5, GADGET_ID_NONE, NULL, NULL, "6" }, { ED_AREA_YAMYAM_CONTENT_XPOS(6), ED_AREA_YAMYAM_CONTENT_YPOS(6), 3, 3, - GADGET_ID_ELEMENT_CONTENT_6, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_6, GADGET_ID_NONE, NULL, NULL, "7" }, { ED_AREA_YAMYAM_CONTENT_XPOS(7), ED_AREA_YAMYAM_CONTENT_YPOS(7), 3, 3, - GADGET_ID_ELEMENT_CONTENT_7, GADGET_ID_NONE, + GADGET_ID_YAMYAM_CONTENT_7, GADGET_ID_NONE, + NULL, NULL, "8" + }, + + /* ---------- magic ball content ----------------------------------------- */ + + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(0), ED_AREA_MAGIC_BALL_CONTENT_YPOS(0), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_0, GADGET_ID_NONE, + NULL, NULL, "1" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(1), ED_AREA_MAGIC_BALL_CONTENT_YPOS(1), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_1, GADGET_ID_NONE, + NULL, NULL, "2" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(2), ED_AREA_MAGIC_BALL_CONTENT_YPOS(2), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_2, GADGET_ID_NONE, + NULL, NULL, "3" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(3), ED_AREA_MAGIC_BALL_CONTENT_YPOS(3), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_3, GADGET_ID_NONE, + NULL, NULL, "4" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(4), ED_AREA_MAGIC_BALL_CONTENT_YPOS(4), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_4, GADGET_ID_NONE, + NULL, NULL, "5" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(5), ED_AREA_MAGIC_BALL_CONTENT_YPOS(5), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_5, GADGET_ID_NONE, + NULL, NULL, "6" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(6), ED_AREA_MAGIC_BALL_CONTENT_YPOS(6), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_6, GADGET_ID_NONE, + NULL, NULL, "7" + }, + { + ED_AREA_MAGIC_BALL_CONTENT_XPOS(7), ED_AREA_MAGIC_BALL_CONTENT_YPOS(7), + 3, 3, + GADGET_ID_MAGIC_BALL_CONTENT_7, GADGET_ID_NONE, NULL, NULL, "8" }, @@ -2620,20 +2705,20 @@ static int editor_hl_emerald_mine_club[] = static int editor_el_emerald_mine_club[] = { - EL_EMC_KEY_5, - EL_EMC_KEY_6, - EL_EMC_KEY_7, - EL_EMC_KEY_8, + EL_EM_KEY_5, + EL_EM_KEY_6, + EL_EM_KEY_7, + EL_EM_KEY_8, - EL_EMC_GATE_5, - EL_EMC_GATE_6, - EL_EMC_GATE_7, - EL_EMC_GATE_8, + EL_EM_GATE_5, + EL_EM_GATE_6, + EL_EM_GATE_7, + EL_EM_GATE_8, - EL_EMC_GATE_5_GRAY, - EL_EMC_GATE_6_GRAY, - EL_EMC_GATE_7_GRAY, - EL_EMC_GATE_8_GRAY, + EL_EM_GATE_5_GRAY, + EL_EM_GATE_6_GRAY, + EL_EM_GATE_7_GRAY, + EL_EM_GATE_8_GRAY, EL_EMC_STEELWALL_1, EL_EMC_STEELWALL_2, @@ -2683,11 +2768,12 @@ static int editor_el_emerald_mine_club[] = EL_EMC_MAGIC_BALL, EL_EMC_MAGIC_BALL_SWITCH, EL_SPRING, - EL_EMC_BUMPER, + EL_EMC_SPRING_BUMPER, -#if 0 - EL_EMC_LEVEL_BORDER, -#endif + EL_EMC_DRIPPER, + EL_EMPTY, + EL_EMPTY, + EL_EMPTY, }; static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club; static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club; @@ -4196,10 +4282,10 @@ static void DrawDrawingArea(int id) for (x = 0; x < group_element_info.num_elements; x++) DrawMiniGraphicExt(drawto, gi->x + x * MINI_TILEX, gi->y, el2edimg(group_element_info.element[x])); - else if (id >= ED_DRAWING_ID_ELEMENT_CONTENT_0 && - id <= ED_DRAWING_ID_ELEMENT_CONTENT_7) + else if (id >= ED_DRAWING_ID_YAMYAM_CONTENT_0 && + id <= ED_DRAWING_ID_YAMYAM_CONTENT_7) { - int nr = id - ED_DRAWING_ID_ELEMENT_CONTENT_0; + int nr = id - ED_DRAWING_ID_YAMYAM_CONTENT_0; for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) @@ -4207,6 +4293,17 @@ static void DrawDrawingArea(int id) gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, el2edimg(level.yamyam_content[nr][x][y])); } + else if (id >= ED_DRAWING_ID_MAGIC_BALL_CONTENT_0 && + id <= ED_DRAWING_ID_MAGIC_BALL_CONTENT_7) + { + int nr = id - ED_DRAWING_ID_MAGIC_BALL_CONTENT_0; + + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) + DrawMiniGraphicExt(drawto, + gi->x + x * MINI_TILEX, gi->y + y * MINI_TILEY, + el2edimg(level.ball_content[nr][x][y])); + } } static void ScrollMiniLevel(int from_x, int from_y, int scroll) @@ -5262,8 +5359,9 @@ static void MapCounterButtons(int id) int y; /* set after gadget position was modified */ #endif - /* set position for "score" counter gadget */ - if (id == ED_COUNTER_ID_ELEMENT_SCORE) + /* set position for "value1/value2" counter gadgets (score in most cases) */ + if (id == ED_COUNTER_ID_ELEMENT_VALUE1 || + id == ED_COUNTER_ID_ELEMENT_VALUE2) { ModifyGadget(gi_down, GDI_Y, SY + counterbutton_info[id].y, GDI_END); ModifyGadget(gi_text, GDI_Y, SY + counterbutton_info[id].y, GDI_END); @@ -6666,24 +6764,27 @@ static void DrawCustomChangeContentArea() MapDrawingArea(id); } -static void DrawElementContentAreas() +static void DrawYamYamContentAreas() { int x = SX + ED_AREA_YAMYAM_CONTENT_XPOS(3) + 4 * MINI_TILEX; int y = SY + ED_AREA_YAMYAM_CONTENT_YPOS(0) + ED_BORDER_AREA_YSIZE; int i; /* display counter to choose number of element content areas */ - MapCounterButtons(ED_COUNTER_ID_ELEMENT_CONTENT); + MapCounterButtons(ED_COUNTER_ID_YAMYAM_CONTENT); for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) { - int id = ED_DRAWING_ID_ELEMENT_CONTENT_0 + i; - int font_height = getFontHeight(FONT_TEXT_1); + int id = ED_DRAWING_ID_YAMYAM_CONTENT_0 + i; if (i < level.num_yamyam_contents) + { MapDrawingArea(id); + } else { + int font_height = getFontHeight(FONT_TEXT_1); + UnmapDrawingArea(id); /* delete content areas in case of reducing number of them */ @@ -6699,6 +6800,20 @@ static void DrawElementContentAreas() DrawText(x, y + 2 * MINI_TILEY, "smashed", FONT_TEXT_1); } +static void DrawMagicBallContentAreas() +{ + int x = SX + ED_AREA_MAGIC_BALL_CONTENT_XPOS(3) + 4 * MINI_TILEX; + int y = SY + ED_AREA_MAGIC_BALL_CONTENT_YPOS(0) + ED_BORDER_AREA_YSIZE; + int i; + + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + MapDrawingArea(ED_DRAWING_ID_MAGIC_BALL_CONTENT_0 + i); + + DrawText(x, y + 0 * MINI_TILEY, "generated", FONT_TEXT_1); + DrawText(x, y + 1 * MINI_TILEY, "when", FONT_TEXT_1); + DrawText(x, y + 2 * MINI_TILEY, "active", FONT_TEXT_1); +} + static void DrawGroupElementArea(int element) { int num_elements = group_element_info.num_elements; @@ -7070,9 +7185,13 @@ static void DrawPropertiesInfo() #define TEXT_COLLECTING "Score for collecting" #define TEXT_SMASHING "Score for smashing" +#define TEXT_SLURPING "Score for slurping" #define TEXT_CRACKING "Score for cracking" -#define TEXT_SPEED "Speed of amoeba growth" +#define TEXT_AMOEBA_SPEED "Speed of amoeba growth" #define TEXT_DURATION "Duration when activated" +#define TEXT_BALL_DELAY "Element generation delay" +#define TEXT_MOVE_SPEED "Speed of android moving" +#define TEXT_CLONE_SPEED "Speed of android cloning" static struct { @@ -7143,12 +7262,28 @@ static struct { EL_EM_KEY_3_FILE, &level.score[SC_KEY], TEXT_COLLECTING }, { EL_EM_KEY_4_FILE, &level.score[SC_KEY], TEXT_COLLECTING }, #endif - { EL_AMOEBA_WET, &level.amoeba_speed, TEXT_SPEED }, - { EL_AMOEBA_DRY, &level.amoeba_speed, TEXT_SPEED }, - { EL_AMOEBA_FULL, &level.amoeba_speed, TEXT_SPEED }, - { EL_BD_AMOEBA, &level.amoeba_speed, TEXT_SPEED }, + { EL_EM_KEY_5, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_EM_KEY_6, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_EM_KEY_7, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_EM_KEY_8, &level.score[SC_KEY], TEXT_COLLECTING }, + { EL_AMOEBA_WET, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, + { EL_AMOEBA_DRY, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, + { EL_AMOEBA_FULL, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, + { EL_BD_AMOEBA, &level.amoeba_speed, TEXT_AMOEBA_SPEED }, { EL_MAGIC_WALL, &level.time_magic_wall, TEXT_DURATION }, { EL_ROBOT_WHEEL, &level.time_wheel, TEXT_DURATION }, + +#if 1 + { EL_EMC_ANDROID, &level.android_move_time, TEXT_MOVE_SPEED }, + { EL_EMC_ANDROID, &level.android_clone_time, TEXT_CLONE_SPEED }, + { EL_EMC_MAGIC_BALL, &level.ball_time, TEXT_BALL_DELAY }, + { EL_EMC_LENSES, &level.lenses_score, TEXT_COLLECTING }, + { EL_EMC_MAGNIFIER, &level.magnify_score, TEXT_COLLECTING }, + { EL_ROBOT, &level.slurp_score, TEXT_SLURPING }, + { EL_EMC_LENSES, &level.lenses_time, TEXT_DURATION }, + { EL_EMC_MAGNIFIER, &level.magnify_time, TEXT_DURATION }, +#endif + { -1, NULL, NULL } }; @@ -7176,6 +7311,8 @@ static boolean checkPropertiesConfig(int element) static void DrawPropertiesConfig() { + int max_num_element_counters = 2; + int num_element_counters = 0; int i; if (!checkPropertiesConfig(properties_element)) @@ -7185,25 +7322,28 @@ static void DrawPropertiesConfig() return; } - /* check if there are elements where a score can be chosen for */ + /* check if there are elements where a value can be chosen for */ for (i = 0; elements_with_counter[i].element != -1; i++) { if (elements_with_counter[i].element == properties_element) { - int counter_id = ED_COUNTER_ID_ELEMENT_SCORE; + int counter_id = ED_COUNTER_ID_ELEMENT_VALUE1 + num_element_counters; counterbutton_info[counter_id].y = ED_SETTINGS_YPOS((HAS_CONTENT(properties_element) ? 1 : 0) + (CAN_GROW(properties_element) ? 1 : 0) + (COULD_MOVE_INTO_ACID(properties_element) ? 1 : 0) + - (MAYBE_DONT_COLLIDE_WITH(properties_element) ? 1 :0)); + (MAYBE_DONT_COLLIDE_WITH(properties_element) ? 1 : 0)+ + num_element_counters); counterbutton_info[counter_id].value = elements_with_counter[i].value; counterbutton_info[counter_id].text_right= elements_with_counter[i].text; MapCounterButtons(counter_id); - break; + num_element_counters++; + if (num_element_counters >= max_num_element_counters) + break; } } @@ -7214,10 +7354,13 @@ static void DrawPropertiesConfig() if (IS_AMOEBOID(properties_element)) MapDrawingArea(ED_DRAWING_ID_AMOEBA_CONTENT); - else - DrawElementContentAreas(); + else if (properties_element == EL_YAMYAM) + DrawYamYamContentAreas(); } + if (properties_element == EL_EMC_MAGIC_BALL) + DrawMagicBallContentAreas(); + if (ELEM_IS_PLAYER(properties_element)) { MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID); @@ -8381,9 +8524,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) } else if (id == GADGET_ID_RANDOM_BACKGROUND) random_placement_background_element = new_element; - else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && - id <= GADGET_ID_ELEMENT_CONTENT_7) - level.yamyam_content[id - GADGET_ID_ELEMENT_CONTENT_0][sx][sy] = + else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && + id <= GADGET_ID_YAMYAM_CONTENT_7) + level.yamyam_content[id - GADGET_ID_YAMYAM_CONTENT_0][sx][sy] = + new_element; + else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && + id <= GADGET_ID_MAGIC_BALL_CONTENT_7) + level.ball_content[id - GADGET_ID_MAGIC_BALL_CONTENT_0][sx][sy] = new_element; } break; @@ -8503,13 +8650,20 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) PickDrawingElement(button, group_element_info.element[sx]); else if (id == GADGET_ID_RANDOM_BACKGROUND) PickDrawingElement(button, random_placement_background_element); - else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && - id <= GADGET_ID_ELEMENT_CONTENT_7) + else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && + id <= GADGET_ID_YAMYAM_CONTENT_7) { - int i = id - GADGET_ID_ELEMENT_CONTENT_0; + int i = id - GADGET_ID_YAMYAM_CONTENT_0; PickDrawingElement(button, level.yamyam_content[i][sx][sy]); } + else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && + id <= GADGET_ID_MAGIC_BALL_CONTENT_7) + { + int i = id - GADGET_ID_MAGIC_BALL_CONTENT_0; + + PickDrawingElement(button, level.ball_content[i][sx][sy]); + } break; @@ -8563,8 +8717,8 @@ static void HandleCounterButtons(struct GadgetInfo *gi) switch (counter_id) { - case ED_COUNTER_ID_ELEMENT_CONTENT: - DrawElementContentAreas(); + case ED_COUNTER_ID_YAMYAM_CONTENT: + DrawYamYamContentAreas(); break; case ED_COUNTER_ID_GROUP_CONTENT: @@ -9501,9 +9655,12 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) element = group_element_info.element[sx]; else if (id == GADGET_ID_RANDOM_BACKGROUND) element = random_placement_background_element; - else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && - id <= GADGET_ID_ELEMENT_CONTENT_7) - element = level.yamyam_content[id - GADGET_ID_ELEMENT_CONTENT_0][sx][sy]; + else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && + id <= GADGET_ID_YAMYAM_CONTENT_7) + element = level.yamyam_content[id - GADGET_ID_YAMYAM_CONTENT_0][sx][sy]; + else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && + id <= GADGET_ID_MAGIC_BALL_CONTENT_7) + element = level.ball_content[id -GADGET_ID_MAGIC_BALL_CONTENT_0][sx][sy]; strncpy(infotext, getElementInfoText(element), max_infotext_len); } @@ -9529,10 +9686,14 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi) sprintf(infotext, "Group element position: %d", sx + 1); else if (id == GADGET_ID_RANDOM_BACKGROUND) strcpy(infotext, "Random placement background"); - else if (id >= GADGET_ID_ELEMENT_CONTENT_0 && - id <= GADGET_ID_ELEMENT_CONTENT_7) + else if (id >= GADGET_ID_YAMYAM_CONTENT_0 && + id <= GADGET_ID_YAMYAM_CONTENT_7) + sprintf(infotext, "Content area %d position: %d, %d", + id - GADGET_ID_YAMYAM_CONTENT_0 + 1, sx, sy); + else if (id >= GADGET_ID_MAGIC_BALL_CONTENT_0 && + id <= GADGET_ID_MAGIC_BALL_CONTENT_7) sprintf(infotext, "Content area %d position: %d, %d", - id - GADGET_ID_ELEMENT_CONTENT_0 + 1, sx, sy); + id - GADGET_ID_MAGIC_BALL_CONTENT_0 + 1, sx, sy); } infotext[max_infotext_len] = '\0'; diff --git a/src/files.c b/src/files.c index 38f50f88..3651ace4 100644 --- a/src/files.c +++ b/src/files.c @@ -162,6 +162,25 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->use_spring_bug = FALSE; level->use_step_counter = FALSE; + /* values for the new EMC elements */ + level->android_move_time = 10; + level->android_clone_time = 10; + level->ball_random = FALSE; + level->ball_state_initial = FALSE; + level->ball_time = 10; + level->lenses_score = 10; + level->magnify_score = 10; + level->slurp_score = 10; + level->lenses_time = 10; + level->magnify_time = 10; + level->wind_direction_initial = MV_NO_MOVING; + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (x = 0; x < 3; x++) + for (y = 0; y < 3; y++) + level->ball_content[i][x][y] = EL_EMPTY; + for (i = 0; i < 16; i++) + level->android_array[i] = FALSE; + level->use_custom_template = FALSE; for (i = 0; i < MAX_LEVEL_NAME_LEN; i++) @@ -1769,16 +1788,27 @@ static void OLD_LoadLevelFromFileInfo_EM(struct LevelInfo *level, void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) { + static int ball_xy[8][2] = + { + { 0, 0 }, + { 1, 0 }, + { 2, 0 }, + { 0, 1 }, + { 2, 1 }, + { 0, 2 }, + { 1, 2 }, + { 2, 2 }, + }; struct LevelInfo_EM *level_em = level->native_em_level; struct LEVEL *lev = level_em->lev; struct PLAYER *ply1 = level_em->ply1; struct PLAYER *ply2 = level_em->ply2; - int i, x, y; + int i, j, x, y; lev->width = MIN(level->fieldx, EM_MAX_CAVE_WIDTH); lev->height = MIN(level->fieldy, EM_MAX_CAVE_HEIGHT); - lev->time_initial = level->time; + lev->time_initial = level->time; lev->required_initial = level->gems_needed; lev->emerald_score = level->score[SC_EMERALD]; @@ -1801,6 +1831,27 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) lev->wonderwall_time_initial = level->time_magic_wall; lev->wheel_time = level->time_wheel; + lev->android_move_time = level->android_move_time; + lev->android_clone_time = level->android_clone_time; + lev->ball_random = level->ball_random; + lev->ball_state_initial = level->ball_state_initial; + lev->ball_time = level->ball_time; + lev->lenses_score = level->lenses_score; + lev->magnify_score = level->magnify_score; + lev->slurp_score = level->slurp_score; + lev->lenses_time = level->lenses_time; + lev->magnify_time = level->magnify_time; + lev->wind_direction_initial = level->wind_direction_initial; + + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (j = 0; j < 8; j++) + lev->ball_array[i][j] = + map_element_RND_to_EM(level-> + ball_content[i][ball_xy[j][0]][ball_xy[j][1]]); + + for (i = 0; i < 16; i++) + lev->android_array[i] = FALSE; /* !!! YET TO COME !!! */ + /* first fill the complete playfield with the default border element */ for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++) for (x = 0; x < EM_MAX_CAVE_WIDTH; x++) @@ -1811,6 +1862,9 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) { int new_element = map_element_RND_to_EM(level->field[x][y]); + if (level->field[x][y] == EL_AMOEBA_DEAD) + new_element = map_element_RND_to_EM(EL_AMOEBA_WET); + level_em->cave[x + 1][y + 1] = new_element; } @@ -1820,34 +1874,47 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) ply2->x_initial = 0; ply2->y_initial = 0; - /* at last, set the two players to their positions in the playfield */ + /* initialize player positions and delete players from the playfield */ for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++) { if (level->field[x][y] == EL_PLAYER_1) { ply1->x_initial = x + 1; ply1->y_initial = y + 1; + level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); } else if (level->field[x][y] == EL_PLAYER_2) { ply2->x_initial = x + 1; ply2->y_initial = y + 1; + level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); } } } void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) { + static int ball_xy[8][2] = + { + { 0, 0 }, + { 1, 0 }, + { 2, 0 }, + { 0, 1 }, + { 2, 1 }, + { 0, 2 }, + { 1, 2 }, + { 2, 2 }, + }; struct LevelInfo_EM *level_em = level->native_em_level; struct LEVEL *lev = level_em->lev; struct PLAYER *ply1 = level_em->ply1; struct PLAYER *ply2 = level_em->ply2; - int i, x, y; + int i, j, x, y; level->fieldx = MIN(lev->width, MAX_LEV_FIELDX); level->fieldy = MIN(lev->height, MAX_LEV_FIELDY); - level->time = lev->time_initial; + level->time = lev->time_initial; level->gems_needed = lev->required_initial; sprintf(level->name, "Level %d", level->file_info.nr); @@ -1874,6 +1941,27 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->time_magic_wall = lev->wonderwall_time_initial; level->time_wheel = lev->wheel_time; + level->android_move_time = lev->android_move_time; + level->android_clone_time = lev->android_clone_time; + level->ball_random = lev->ball_random; + level->ball_state_initial = lev->ball_state_initial; + level->ball_time = lev->ball_time; + level->lenses_score = lev->lenses_score; + level->magnify_score = lev->magnify_score; + level->slurp_score = lev->slurp_score; + level->lenses_time = lev->lenses_time; + level->magnify_time = lev->magnify_time; + level->wind_direction_initial = lev->wind_direction_initial; + + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (j = 0; j < 8; j++) + level->ball_content[i][ball_xy[j][0]][ball_xy[j][1]] = + map_element_EM_to_RND(lev->ball_array[i][j]); + + for (i = 0; i < 16; i++) + level->android_array[i] = FALSE; /* !!! YET TO COME !!! */ + + /* convert the playfield (some elements need special treatment) */ for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) { int new_element = map_element_EM_to_RND(level_em->cave[x + 1][y + 1]); @@ -1884,7 +1972,7 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->field[x][y] = new_element; } - /* if both players are set to the same field, use the first player */ + /* in case of both players set to the same field, use the first player */ level->field[ply2->x_initial - 1][ply2->y_initial - 1] = EL_PLAYER_2; level->field[ply1->x_initial - 1][ply1->y_initial - 1] = EL_PLAYER_1; } diff --git a/src/game_em/cave.c b/src/game_em/cave.c index 6bd46220..4f8500cc 100644 --- a/src/game_em/cave.c +++ b/src/game_em/cave.c @@ -9,8 +9,6 @@ #include "file.h" -struct cave_node *cave_list; - static void setLevelInfoToDefaults_EM(void) { native_em_level.lev = &lev; @@ -28,7 +26,7 @@ static void setLevelInfoToDefaults_EM(void) } -/* attempt load a cave +/* load cave * * completely initializes the level structure, ready for a game */ diff --git a/src/game_em/convert.c b/src/game_em/convert.c index 2672054f..3f86d332 100644 --- a/src/game_em/convert.c +++ b/src/game_em/convert.c @@ -423,7 +423,11 @@ static unsigned short remap_emerald[256] = void convert_em_level(unsigned char *src) { - unsigned int x, y, temp; + static int eater_offset[8] = + { + 0x800, 0x809, 0x812, 0x81B, 0x840, 0x849, 0x852, 0x85B + }; + unsigned int i, x, y, temp; temp = ((src[0x83E] << 8 | src[0x83F]) * 25 + 3) / 4; if (temp == 0 || temp > 9999) @@ -486,22 +490,9 @@ void convert_em_level(unsigned char *src) lev.wonderwall_state_initial = 0; lev.wonderwall_time_initial = src[0x836] << 8 | src[0x837]; - for (x = 0; x < 9; x++) - lev.eater_array[0][x] = remap_emerald[src[0x800 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[1][x] = remap_emerald[src[0x809 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[2][x] = remap_emerald[src[0x812 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[3][x] = remap_emerald[src[0x81B + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[4][x] = remap_emerald[src[0x840 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[5][x] = remap_emerald[src[0x849 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[6][x] = remap_emerald[src[0x852 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[7][x] = remap_emerald[src[0x85B + x]]; + for (i = 0; i < 8; i++) + for (x = 0; x < 9; x++) + lev.eater_array[i][x] = remap_emerald[src[eater_offset[i] + x]]; temp = remap_emerald[src[0x86F]]; for (y = 0; y < 8; y++) @@ -513,14 +504,14 @@ void convert_em_level(unsigned char *src) } else { - lev.ball_array[y][1] = (src[0x873] & 1) ? temp : Xblank; /* north */ - lev.ball_array[y][6] = (src[0x873] & 2) ? temp : Xblank; /* south */ - lev.ball_array[y][3] = (src[0x873] & 4) ? temp : Xblank; /* west */ - lev.ball_array[y][4] = (src[0x873] & 8) ? temp : Xblank; /* east */ + lev.ball_array[y][1] = (src[0x873] & 1) ? temp : Xblank; /* north */ + lev.ball_array[y][6] = (src[0x873] & 2) ? temp : Xblank; /* south */ + lev.ball_array[y][3] = (src[0x873] & 4) ? temp : Xblank; /* west */ + lev.ball_array[y][4] = (src[0x873] & 8) ? temp : Xblank; /* east */ lev.ball_array[y][7] = (src[0x873] & 16) ? temp : Xblank; /* southeast */ lev.ball_array[y][5] = (src[0x873] & 32) ? temp : Xblank; /* southwest */ lev.ball_array[y][2] = (src[0x873] & 64) ? temp : Xblank; /* northeast */ - lev.ball_array[y][0] = (src[0x873] & 128) ? temp : Xblank;/* northwest */ + lev.ball_array[y][0] = (src[0x873] & 128)? temp : Xblank; /* northwest */ } } diff --git a/src/init.c b/src/init.c index f0f528ce..881a5c33 100644 --- a/src/init.c +++ b/src/init.c @@ -1795,6 +1795,7 @@ void InitElementPropertiesStatic() EL_TRAP, EL_INVISIBLE_SAND, EL_INVISIBLE_SAND_ACTIVE, + EL_EMC_GRASS, /* !!! currently not diggable, but handled by 'ep_dont_run_into' !!! */ /* (if amoeba can grow into anything diggable, maybe keep these out) */ @@ -1802,6 +1803,7 @@ void InitElementPropertiesStatic() EL_LANDMINE, EL_TRAP_ACTIVE, EL_SP_BUGGY_BASE_ACTIVE, + EL_EMC_PLANT, #endif -1 }; @@ -1822,6 +1824,10 @@ void InitElementPropertiesStatic() EL_EM_KEY_2, EL_EM_KEY_3, EL_EM_KEY_4, + EL_EM_KEY_5, + EL_EM_KEY_6, + EL_EM_KEY_7, + EL_EM_KEY_8, EL_DYNAMITE, EL_DYNABOMB_INCREASE_NUMBER, EL_DYNABOMB_INCREASE_SIZE, @@ -1839,6 +1845,8 @@ void InitElementPropertiesStatic() EL_ENVELOPE_3, EL_ENVELOPE_4, EL_SPEED_PILL, + EL_EMC_LENSES, + EL_EMC_MAGNIFIER, -1 }; @@ -1867,6 +1875,7 @@ void InitElementPropertiesStatic() EL_LANDMINE, EL_TRAP_ACTIVE, EL_SP_BUGGY_BASE_ACTIVE, + EL_EMC_PLANT, #endif -1 }; @@ -2032,6 +2041,10 @@ void InitElementPropertiesStatic() EL_STEELWALL_SLIPPERY, EL_PEARL, EL_CRYSTAL, + EL_EMC_WALL_SLIPPERY_1, + EL_EMC_WALL_SLIPPERY_2, + EL_EMC_WALL_SLIPPERY_3, + EL_EMC_WALL_SLIPPERY_4, -1 }; @@ -2060,6 +2073,7 @@ void InitElementPropertiesStatic() EL_SP_ELECTRON, EL_BALLOON, EL_SPRING, + EL_EMC_ANDROID, -1 }; @@ -2240,10 +2254,18 @@ void InitElementPropertiesStatic() EL_EM_GATE_2, EL_EM_GATE_3, EL_EM_GATE_4, + EL_EM_GATE_5, + EL_EM_GATE_6, + EL_EM_GATE_7, + EL_EM_GATE_8, EL_EM_GATE_1_GRAY, EL_EM_GATE_2_GRAY, EL_EM_GATE_3_GRAY, EL_EM_GATE_4_GRAY, + EL_EM_GATE_5_GRAY, + EL_EM_GATE_6_GRAY, + EL_EM_GATE_7_GRAY, + EL_EM_GATE_8_GRAY, EL_SWITCHGATE_OPEN, EL_TIMEGATE_OPEN, -1 @@ -2304,6 +2326,7 @@ void InitElementPropertiesStatic() EL_SATELLITE, EL_SP_DISK_YELLOW, EL_BALLOON, + EL_EMC_ANDROID, -1 }; @@ -2332,10 +2355,18 @@ void InitElementPropertiesStatic() EL_EM_GATE_2, EL_EM_GATE_3, EL_EM_GATE_4, + EL_EM_GATE_5, + EL_EM_GATE_6, + EL_EM_GATE_7, + EL_EM_GATE_8, EL_EM_GATE_1_GRAY, EL_EM_GATE_2_GRAY, EL_EM_GATE_3_GRAY, EL_EM_GATE_4_GRAY, + EL_EM_GATE_5_GRAY, + EL_EM_GATE_6_GRAY, + EL_EM_GATE_7_GRAY, + EL_EM_GATE_8_GRAY, EL_SWITCHGATE_OPEN, EL_TIMEGATE_OPEN, @@ -2429,6 +2460,7 @@ void InitElementPropertiesStatic() EL_SP_GRAVITY_OFF_PORT_RIGHT, EL_SP_GRAVITY_OFF_PORT_UP, EL_SP_GRAVITY_OFF_PORT_DOWN, + EL_EMC_GRASS, -1 }; @@ -2485,6 +2517,7 @@ void InitElementPropertiesStatic() EL_BALLOON_SWITCH_ANY, EL_LAMP, EL_TIME_ORB_FULL, + EL_EMC_MAGIC_BALL_SWITCH, -1 }; @@ -2995,10 +3028,18 @@ void InitElementPropertiesStatic() EL_EM_GATE_2, EL_EM_GATE_3, EL_EM_GATE_4, + EL_EM_GATE_5, + EL_EM_GATE_6, + EL_EM_GATE_7, + EL_EM_GATE_8, EL_EM_GATE_1_GRAY, EL_EM_GATE_2_GRAY, EL_EM_GATE_3_GRAY, EL_EM_GATE_4_GRAY, + EL_EM_GATE_5_GRAY, + EL_EM_GATE_6_GRAY, + EL_EM_GATE_7_GRAY, + EL_EM_GATE_8_GRAY, -1 }; @@ -3080,6 +3121,10 @@ void InitElementPropertiesStatic() EL_EM_KEY_2, EL_EM_KEY_3, EL_EM_KEY_4, + EL_EM_KEY_5, + EL_EM_KEY_6, + EL_EM_KEY_7, + EL_EM_KEY_8, EL_GATE_1, EL_GATE_2, EL_GATE_3, @@ -3092,10 +3137,18 @@ void InitElementPropertiesStatic() EL_EM_GATE_2, EL_EM_GATE_3, EL_EM_GATE_4, + EL_EM_GATE_5, + EL_EM_GATE_6, + EL_EM_GATE_7, + EL_EM_GATE_8, EL_EM_GATE_1_GRAY, EL_EM_GATE_2_GRAY, EL_EM_GATE_3_GRAY, EL_EM_GATE_4_GRAY, + EL_EM_GATE_5_GRAY, + EL_EM_GATE_6_GRAY, + EL_EM_GATE_7_GRAY, + EL_EM_GATE_8_GRAY, EL_DYNAMITE, EL_INVISIBLE_STEELWALL, EL_INVISIBLE_WALL, @@ -3197,6 +3250,10 @@ void InitElementPropertiesStatic() EL_EMC_STEELWALL_2, EL_EMC_STEELWALL_3, EL_EMC_STEELWALL_4, + EL_EMC_WALL_SLIPPERY_1, + EL_EMC_WALL_SLIPPERY_2, + EL_EMC_WALL_SLIPPERY_3, + EL_EMC_WALL_SLIPPERY_4, EL_EMC_WALL_1, EL_EMC_WALL_2, EL_EMC_WALL_3, @@ -3205,6 +3262,14 @@ void InitElementPropertiesStatic() EL_EMC_WALL_6, EL_EMC_WALL_7, EL_EMC_WALL_8, + EL_EMC_WALL_9, + EL_EMC_WALL_10, + EL_EMC_WALL_11, + EL_EMC_WALL_12, + EL_EMC_WALL_13, + EL_EMC_WALL_14, + EL_EMC_WALL_15, + EL_EMC_WALL_16, -1 }; diff --git a/src/main.c b/src/main.c index ab07ad01..35ecbaca 100644 --- a/src/main.c +++ b/src/main.c @@ -3465,94 +3465,89 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "stop moving balloon" }, { - "emc_level_border", - "wall", - "level border steelwall", - }, - { - "emc_android", - "emc_android", - "android", - }, - { - "emc_grass", - "emc_grass", - "grass", - }, - { - "emc_magic_ball", - "emc_magic_ball", - "magic ball", - }, - { - "emc_magic_ball_switch", - "emc_magic_ball_switch", - "magic ball switch", - }, - { - "emc_gate_5", + "em_gate_5", "gate", "door 5 (EMC style)", }, { - "emc_gate_6", + "em_gate_6", "gate", "door 6 (EMC style)", }, { - "emc_gate_7", + "em_gate_7", "gate", "door 7 (EMC style)", }, { - "emc_gate_8", + "em_gate_8", "gate", "door 8 (EMC style)", }, { - "emc_gate_5_gray", + "em_gate_5_gray", "gate", "gray door (EMC style, key 5)", }, { - "emc_gate_6_gray", + "em_gate_6_gray", "gate", "gray door (EMC style, key 6)", }, { - "emc_gate_7_gray", + "em_gate_7_gray", "gate", "gray door (EMC style, key 7)", }, { - "emc_gate_8_gray", + "em_gate_8_gray", "gate", "gray door (EMC style, key 8)", }, { - "emc_key_5", + "em_key_5", "key", "key 5 (EMC style)", }, { - "emc_key_6", + "em_key_6", "key", "key 6 (EMC style)", }, { - "emc_key_7", + "em_key_7", "key", "key 7 (EMC style)", }, { - "emc_key_8", + "em_key_8", "key", "key 8 (EMC style)", }, { - "emc_bumper", - "emc_bumper", - "bumper", + "emc_android", + "emc_android", + "android", + }, + { + "emc_grass", + "emc_grass", + "grass", + }, + { + "emc_magic_ball", + "emc_magic_ball", + "magic ball", + }, + { + "emc_magic_ball_switch", + "emc_magic_ball_switch", + "magic ball switch", + }, + { + "emc_spring_bumper", + "emc_spring_bumper", + "spring bumper", }, { "emc_plant", @@ -3629,6 +3624,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "wall", "slippery wall" }, + { + "emc_dripper", + "dripper", + "dripper" + }, /* ----------------------------------------------------------------------- */ /* "real" (and therefore drawable) runtime elements */ diff --git a/src/main.h b/src/main.h index 65e3a7ee..e12649ef 100644 --- a/src/main.h +++ b/src/main.h @@ -542,6 +542,7 @@ #define MIN_ELEMENT_CONTENTS 1 #define STD_ELEMENT_CONTENTS 4 #define MAX_ELEMENT_CONTENTS 8 +#define NUM_MAGIC_BALL_CONTENTS 8 #define LEVEL_SCORE_ELEMENTS 16 /* level elements with score */ @@ -966,39 +967,39 @@ /* 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_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 EL_EM_GATE_5 668 +#define EL_EM_GATE_6 669 +#define EL_EM_GATE_7 670 +#define EL_EM_GATE_8 671 +#define EL_EM_GATE_5_GRAY 672 +#define EL_EM_GATE_6_GRAY 673 +#define EL_EM_GATE_7_GRAY 674 +#define EL_EM_GATE_8_GRAY 675 +#define EL_EM_KEY_5 676 +#define EL_EM_KEY_6 677 +#define EL_EM_KEY_7 678 +#define EL_EM_KEY_8 679 +#define EL_EMC_ANDROID 680 +#define EL_EMC_GRASS 681 +#define EL_EMC_MAGIC_BALL 682 +#define EL_EMC_MAGIC_BALL_SWITCH 683 +#define EL_EMC_SPRING_BUMPER 684 +#define EL_EMC_PLANT 685 +#define EL_EMC_LENSES 686 +#define EL_EMC_MAGNIFIER 687 +#define EL_EMC_WALL_9 688 +#define EL_EMC_WALL_10 689 +#define EL_EMC_WALL_11 690 +#define EL_EMC_WALL_12 691 +#define EL_EMC_WALL_13 692 +#define EL_EMC_WALL_14 693 +#define EL_EMC_WALL_15 694 +#define EL_EMC_WALL_16 695 +#define EL_EMC_WALL_SLIPPERY_1 696 +#define EL_EMC_WALL_SLIPPERY_2 697 +#define EL_EMC_WALL_SLIPPERY_3 698 +#define EL_EMC_WALL_SLIPPERY_4 699 +#define EL_EMC_DRIPPER 700 #define NUM_FILE_ELEMENTS 701 @@ -1553,6 +1554,21 @@ struct LevelInfo int time_light; int time_timegate; + /* values for the new EMC elements */ + int android_move_time; + int android_clone_time; + boolean ball_random; + boolean ball_state_initial; + int ball_time; + int lenses_score; + int magnify_score; + int slurp_score; + int lenses_time; + int magnify_time; + int wind_direction_initial; + int ball_content[NUM_MAGIC_BALL_CONTENTS][3][3]; + boolean android_array[16]; + int can_move_into_acid_bits; /* bitfield to store property for elements */ int dont_collide_with_bits; /* bitfield to store property for elements */ diff --git a/src/tools.c b/src/tools.c index 436b3cdb..15c1ab4f 100644 --- a/src/tools.c +++ b/src/tools.c @@ -3902,19 +3902,19 @@ mapping_EM_to_RND_list[] = }, { Xdoor_5, TRUE, - EL_EMC_GATE_5, -1, -1 + EL_EM_GATE_5, -1, -1 }, { Xdoor_6, TRUE, - EL_EMC_GATE_6, -1, -1 + EL_EM_GATE_6, -1, -1 }, { Xdoor_7, TRUE, - EL_EMC_GATE_7, -1, -1 + EL_EM_GATE_7, -1, -1 }, { Xdoor_8, TRUE, - EL_EMC_GATE_8, -1, -1 + EL_EM_GATE_8, -1, -1 }, { Xkey_1, TRUE, @@ -3934,19 +3934,19 @@ mapping_EM_to_RND_list[] = }, { Xkey_5, TRUE, - EL_EMC_KEY_5, -1, -1 + EL_EM_KEY_5, -1, -1 }, { Xkey_6, TRUE, - EL_EMC_KEY_6, -1, -1 + EL_EM_KEY_6, -1, -1 }, { Xkey_7, TRUE, - EL_EMC_KEY_7, -1, -1 + EL_EM_KEY_7, -1, -1 }, { Xkey_8, TRUE, - EL_EMC_KEY_8, -1, -1 + EL_EM_KEY_8, -1, -1 }, { Xwind_n, TRUE, @@ -4014,11 +4014,11 @@ mapping_EM_to_RND_list[] = }, { Xbumper, TRUE, - EL_EMC_BUMPER, -1, -1 + EL_EMC_SPRING_BUMPER, -1, -1 }, { XbumperB, FALSE, - EL_EMC_BUMPER, -1, -1 + EL_EMC_SPRING_BUMPER, -1, -1 }, { Xwheel, TRUE, @@ -4117,8 +4117,8 @@ mapping_EM_to_RND_list[] = EL_EMC_MAGNIFIER, -1, -1 }, { - Xdripper, FALSE, - EL_UNKNOWN, -1, -1 + Xdripper, TRUE, + EL_EMC_DRIPPER, -1, -1 }, { XdripperB, FALSE, @@ -4158,19 +4158,19 @@ mapping_EM_to_RND_list[] = }, { Xfake_door_5, TRUE, - EL_EMC_GATE_5_GRAY, -1, -1 + EL_EM_GATE_5_GRAY, -1, -1 }, { Xfake_door_6, TRUE, - EL_EMC_GATE_6_GRAY, -1, -1 + EL_EM_GATE_6_GRAY, -1, -1 }, { Xfake_door_7, TRUE, - EL_EMC_GATE_7_GRAY, -1, -1 + EL_EM_GATE_7_GRAY, -1, -1 }, { Xfake_door_8, TRUE, - EL_EMC_GATE_8_GRAY, -1, -1 + EL_EM_GATE_8_GRAY, -1, -1 }, { Xsteel_1, TRUE, @@ -4453,16 +4453,6 @@ mapping_EM_to_RND_list[] = EL_CHAR('©'), -1, -1 }, - { - Zplayer, TRUE, - EL_PLAYER_1, -1, -1 - }, - - { - ZBORDER, TRUE, - EL_EMC_LEVEL_BORDER, -1, -1 - }, - { -1, FALSE, -1, -1, -1