From: Holger Schemel Date: Sat, 20 Mar 2004 22:28:14 +0000 (+0100) Subject: rnd-20040320-2-src X-Git-Tag: 3.1.0^2~42 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=074c00b42409c74e9c5856db1be03dced3a15ae9;p=rocksndiamonds.git rnd-20040320-2-src --- diff --git a/src/conf_e2g.c b/src/conf_e2g.c index aafefbb6..3016da76 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -2533,14 +2533,6 @@ element_to_graphic[] = EL_TRIGGER_PLAYER, -1, -1, FALSE, IMG_TRIGGER_PLAYER }, - { - EL_INTERNAL_CLIPBOARD_CUSTOM, -1, -1, FALSE, - IMG_INTERNAL_CLIPBOARD_CUSTOM - }, - { - EL_INTERNAL_CLIPBOARD_GROUP, -1, -1, FALSE, - IMG_INTERNAL_CLIPBOARD_GROUP - }, { EL_BD_BUTTERFLY_DOWN, -1, -1, FALSE, IMG_BD_BUTTERFLY diff --git a/src/conf_esg.c b/src/conf_esg.c index 53d7b0ed..d981a115 100644 --- a/src/conf_esg.c +++ b/src/conf_esg.c @@ -279,14 +279,6 @@ element_to_special_graphic[] = EL_INVISIBLE_STEELWALL_VERTICAL, GFX_SPECIAL_ARG_EDITOR, IMG_INVISIBLE_STEELWALL_VERTICAL_EDITOR }, - { - EL_INTERNAL_CLIPBOARD_CUSTOM, GFX_SPECIAL_ARG_EDITOR, - IMG_INTERNAL_CLIPBOARD_CUSTOM_EDITOR - }, - { - EL_INTERNAL_CLIPBOARD_GROUP, GFX_SPECIAL_ARG_EDITOR, - IMG_INTERNAL_CLIPBOARD_GROUP_EDITOR - }, { EL_CUSTOM_1, GFX_SPECIAL_ARG_EDITOR, IMG_CUSTOM_1_EDITOR diff --git a/src/conf_gfx.c b/src/conf_gfx.c index a7bc64e4..db8957cc 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -3160,22 +3160,6 @@ struct ConfigInfo image_config[] = { "trigger_player.ypos", "13" }, { "trigger_player.frames", "1" }, - { "internal_clipboard_custom", "RocksElements.pcx" }, - { "internal_clipboard_custom.xpos", "7" }, - { "internal_clipboard_custom.ypos", "9" }, - { "internal_clipboard_custom.frames", "1" }, - { "internal_clipboard_custom.EDITOR", "RocksElements.pcx" }, - { "internal_clipboard_custom.EDITOR.xpos", "15" }, - { "internal_clipboard_custom.EDITOR.ypos", "13" }, - - { "internal_clipboard_group", "RocksDC.pcx" }, - { "internal_clipboard_group.xpos", "4" }, - { "internal_clipboard_group.ypos", "15" }, - { "internal_clipboard_group.frames", "1" }, - { "internal_clipboard_group.EDITOR", "RocksDC.pcx" }, - { "internal_clipboard_group.EDITOR.xpos", "14" }, - { "internal_clipboard_group.EDITOR.ypos", "15" }, - #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 7adec86e..67ec08c2 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -658,756 +658,752 @@ #define IMG_UNKNOWN 637 #define IMG_TRIGGER_ELEMENT 638 #define IMG_TRIGGER_PLAYER 639 -#define IMG_INTERNAL_CLIPBOARD_CUSTOM 640 -#define IMG_INTERNAL_CLIPBOARD_CUSTOM_EDITOR 641 -#define IMG_INTERNAL_CLIPBOARD_GROUP 642 -#define IMG_INTERNAL_CLIPBOARD_GROUP_EDITOR 643 -#define IMG_CHAR_SPACE 644 -#define IMG_CHAR_EXCLAM 645 -#define IMG_CHAR_QUOTEDBL 646 -#define IMG_CHAR_NUMBERSIGN 647 -#define IMG_CHAR_DOLLAR 648 -#define IMG_CHAR_PROCENT 649 -#define IMG_CHAR_AMPERSAND 650 -#define IMG_CHAR_APOSTROPHE 651 -#define IMG_CHAR_PARENLEFT 652 -#define IMG_CHAR_PARENRIGHT 653 -#define IMG_CHAR_ASTERISK 654 -#define IMG_CHAR_PLUS 655 -#define IMG_CHAR_COMMA 656 -#define IMG_CHAR_MINUS 657 -#define IMG_CHAR_PERIOD 658 -#define IMG_CHAR_SLASH 659 -#define IMG_CHAR_0 660 -#define IMG_CHAR_1 661 -#define IMG_CHAR_2 662 -#define IMG_CHAR_3 663 -#define IMG_CHAR_4 664 -#define IMG_CHAR_5 665 -#define IMG_CHAR_6 666 -#define IMG_CHAR_7 667 -#define IMG_CHAR_8 668 -#define IMG_CHAR_9 669 -#define IMG_CHAR_COLON 670 -#define IMG_CHAR_SEMICOLON 671 -#define IMG_CHAR_LESS 672 -#define IMG_CHAR_EQUAL 673 -#define IMG_CHAR_GREATER 674 -#define IMG_CHAR_QUESTION 675 -#define IMG_CHAR_AT 676 -#define IMG_CHAR_A 677 -#define IMG_CHAR_B 678 -#define IMG_CHAR_C 679 -#define IMG_CHAR_D 680 -#define IMG_CHAR_E 681 -#define IMG_CHAR_F 682 -#define IMG_CHAR_G 683 -#define IMG_CHAR_H 684 -#define IMG_CHAR_I 685 -#define IMG_CHAR_J 686 -#define IMG_CHAR_K 687 -#define IMG_CHAR_L 688 -#define IMG_CHAR_M 689 -#define IMG_CHAR_N 690 -#define IMG_CHAR_O 691 -#define IMG_CHAR_P 692 -#define IMG_CHAR_Q 693 -#define IMG_CHAR_R 694 -#define IMG_CHAR_S 695 -#define IMG_CHAR_T 696 -#define IMG_CHAR_U 697 -#define IMG_CHAR_V 698 -#define IMG_CHAR_W 699 -#define IMG_CHAR_X 700 -#define IMG_CHAR_Y 701 -#define IMG_CHAR_Z 702 -#define IMG_CHAR_BRACKETLEFT 703 -#define IMG_CHAR_BACKSLASH 704 -#define IMG_CHAR_BRACKETRIGHT 705 -#define IMG_CHAR_ASCIICIRCUM 706 -#define IMG_CHAR_UNDERSCORE 707 -#define IMG_CHAR_COPYRIGHT 708 -#define IMG_CHAR_AUMLAUT 709 -#define IMG_CHAR_OUMLAUT 710 -#define IMG_CHAR_UUMLAUT 711 -#define IMG_CHAR_DEGREE 712 -#define IMG_CHAR_TRADEMARK 713 -#define IMG_CHAR_CURSOR 714 -#define IMG_CUSTOM_1 715 -#define IMG_CUSTOM_1_EDITOR 716 -#define IMG_CUSTOM_2 717 -#define IMG_CUSTOM_2_EDITOR 718 -#define IMG_CUSTOM_3 719 -#define IMG_CUSTOM_3_EDITOR 720 -#define IMG_CUSTOM_4 721 -#define IMG_CUSTOM_4_EDITOR 722 -#define IMG_CUSTOM_5 723 -#define IMG_CUSTOM_5_EDITOR 724 -#define IMG_CUSTOM_6 725 -#define IMG_CUSTOM_6_EDITOR 726 -#define IMG_CUSTOM_7 727 -#define IMG_CUSTOM_7_EDITOR 728 -#define IMG_CUSTOM_8 729 -#define IMG_CUSTOM_8_EDITOR 730 -#define IMG_CUSTOM_9 731 -#define IMG_CUSTOM_9_EDITOR 732 -#define IMG_CUSTOM_10 733 -#define IMG_CUSTOM_10_EDITOR 734 -#define IMG_CUSTOM_11 735 -#define IMG_CUSTOM_11_EDITOR 736 -#define IMG_CUSTOM_12 737 -#define IMG_CUSTOM_12_EDITOR 738 -#define IMG_CUSTOM_13 739 -#define IMG_CUSTOM_13_EDITOR 740 -#define IMG_CUSTOM_14 741 -#define IMG_CUSTOM_14_EDITOR 742 -#define IMG_CUSTOM_15 743 -#define IMG_CUSTOM_15_EDITOR 744 -#define IMG_CUSTOM_16 745 -#define IMG_CUSTOM_16_EDITOR 746 -#define IMG_CUSTOM_17 747 -#define IMG_CUSTOM_17_EDITOR 748 -#define IMG_CUSTOM_18 749 -#define IMG_CUSTOM_18_EDITOR 750 -#define IMG_CUSTOM_19 751 -#define IMG_CUSTOM_19_EDITOR 752 -#define IMG_CUSTOM_20 753 -#define IMG_CUSTOM_20_EDITOR 754 -#define IMG_CUSTOM_21 755 -#define IMG_CUSTOM_21_EDITOR 756 -#define IMG_CUSTOM_22 757 -#define IMG_CUSTOM_22_EDITOR 758 -#define IMG_CUSTOM_23 759 -#define IMG_CUSTOM_23_EDITOR 760 -#define IMG_CUSTOM_24 761 -#define IMG_CUSTOM_24_EDITOR 762 -#define IMG_CUSTOM_25 763 -#define IMG_CUSTOM_25_EDITOR 764 -#define IMG_CUSTOM_26 765 -#define IMG_CUSTOM_26_EDITOR 766 -#define IMG_CUSTOM_27 767 -#define IMG_CUSTOM_27_EDITOR 768 -#define IMG_CUSTOM_28 769 -#define IMG_CUSTOM_28_EDITOR 770 -#define IMG_CUSTOM_29 771 -#define IMG_CUSTOM_29_EDITOR 772 -#define IMG_CUSTOM_30 773 -#define IMG_CUSTOM_30_EDITOR 774 -#define IMG_CUSTOM_31 775 -#define IMG_CUSTOM_31_EDITOR 776 -#define IMG_CUSTOM_32 777 -#define IMG_CUSTOM_32_EDITOR 778 -#define IMG_CUSTOM_33 779 -#define IMG_CUSTOM_33_EDITOR 780 -#define IMG_CUSTOM_34 781 -#define IMG_CUSTOM_34_EDITOR 782 -#define IMG_CUSTOM_35 783 -#define IMG_CUSTOM_35_EDITOR 784 -#define IMG_CUSTOM_36 785 -#define IMG_CUSTOM_36_EDITOR 786 -#define IMG_CUSTOM_37 787 -#define IMG_CUSTOM_37_EDITOR 788 -#define IMG_CUSTOM_38 789 -#define IMG_CUSTOM_38_EDITOR 790 -#define IMG_CUSTOM_39 791 -#define IMG_CUSTOM_39_EDITOR 792 -#define IMG_CUSTOM_40 793 -#define IMG_CUSTOM_40_EDITOR 794 -#define IMG_CUSTOM_41 795 -#define IMG_CUSTOM_41_EDITOR 796 -#define IMG_CUSTOM_42 797 -#define IMG_CUSTOM_42_EDITOR 798 -#define IMG_CUSTOM_43 799 -#define IMG_CUSTOM_43_EDITOR 800 -#define IMG_CUSTOM_44 801 -#define IMG_CUSTOM_44_EDITOR 802 -#define IMG_CUSTOM_45 803 -#define IMG_CUSTOM_45_EDITOR 804 -#define IMG_CUSTOM_46 805 -#define IMG_CUSTOM_46_EDITOR 806 -#define IMG_CUSTOM_47 807 -#define IMG_CUSTOM_47_EDITOR 808 -#define IMG_CUSTOM_48 809 -#define IMG_CUSTOM_48_EDITOR 810 -#define IMG_CUSTOM_49 811 -#define IMG_CUSTOM_49_EDITOR 812 -#define IMG_CUSTOM_50 813 -#define IMG_CUSTOM_50_EDITOR 814 -#define IMG_CUSTOM_51 815 -#define IMG_CUSTOM_51_EDITOR 816 -#define IMG_CUSTOM_52 817 -#define IMG_CUSTOM_52_EDITOR 818 -#define IMG_CUSTOM_53 819 -#define IMG_CUSTOM_53_EDITOR 820 -#define IMG_CUSTOM_54 821 -#define IMG_CUSTOM_54_EDITOR 822 -#define IMG_CUSTOM_55 823 -#define IMG_CUSTOM_55_EDITOR 824 -#define IMG_CUSTOM_56 825 -#define IMG_CUSTOM_56_EDITOR 826 -#define IMG_CUSTOM_57 827 -#define IMG_CUSTOM_57_EDITOR 828 -#define IMG_CUSTOM_58 829 -#define IMG_CUSTOM_58_EDITOR 830 -#define IMG_CUSTOM_59 831 -#define IMG_CUSTOM_59_EDITOR 832 -#define IMG_CUSTOM_60 833 -#define IMG_CUSTOM_60_EDITOR 834 -#define IMG_CUSTOM_61 835 -#define IMG_CUSTOM_61_EDITOR 836 -#define IMG_CUSTOM_62 837 -#define IMG_CUSTOM_62_EDITOR 838 -#define IMG_CUSTOM_63 839 -#define IMG_CUSTOM_63_EDITOR 840 -#define IMG_CUSTOM_64 841 -#define IMG_CUSTOM_64_EDITOR 842 -#define IMG_CUSTOM_65 843 -#define IMG_CUSTOM_65_EDITOR 844 -#define IMG_CUSTOM_66 845 -#define IMG_CUSTOM_66_EDITOR 846 -#define IMG_CUSTOM_67 847 -#define IMG_CUSTOM_67_EDITOR 848 -#define IMG_CUSTOM_68 849 -#define IMG_CUSTOM_68_EDITOR 850 -#define IMG_CUSTOM_69 851 -#define IMG_CUSTOM_69_EDITOR 852 -#define IMG_CUSTOM_70 853 -#define IMG_CUSTOM_70_EDITOR 854 -#define IMG_CUSTOM_71 855 -#define IMG_CUSTOM_71_EDITOR 856 -#define IMG_CUSTOM_72 857 -#define IMG_CUSTOM_72_EDITOR 858 -#define IMG_CUSTOM_73 859 -#define IMG_CUSTOM_73_EDITOR 860 -#define IMG_CUSTOM_74 861 -#define IMG_CUSTOM_74_EDITOR 862 -#define IMG_CUSTOM_75 863 -#define IMG_CUSTOM_75_EDITOR 864 -#define IMG_CUSTOM_76 865 -#define IMG_CUSTOM_76_EDITOR 866 -#define IMG_CUSTOM_77 867 -#define IMG_CUSTOM_77_EDITOR 868 -#define IMG_CUSTOM_78 869 -#define IMG_CUSTOM_78_EDITOR 870 -#define IMG_CUSTOM_79 871 -#define IMG_CUSTOM_79_EDITOR 872 -#define IMG_CUSTOM_80 873 -#define IMG_CUSTOM_80_EDITOR 874 -#define IMG_CUSTOM_81 875 -#define IMG_CUSTOM_81_EDITOR 876 -#define IMG_CUSTOM_82 877 -#define IMG_CUSTOM_82_EDITOR 878 -#define IMG_CUSTOM_83 879 -#define IMG_CUSTOM_83_EDITOR 880 -#define IMG_CUSTOM_84 881 -#define IMG_CUSTOM_84_EDITOR 882 -#define IMG_CUSTOM_85 883 -#define IMG_CUSTOM_85_EDITOR 884 -#define IMG_CUSTOM_86 885 -#define IMG_CUSTOM_86_EDITOR 886 -#define IMG_CUSTOM_87 887 -#define IMG_CUSTOM_87_EDITOR 888 -#define IMG_CUSTOM_88 889 -#define IMG_CUSTOM_88_EDITOR 890 -#define IMG_CUSTOM_89 891 -#define IMG_CUSTOM_89_EDITOR 892 -#define IMG_CUSTOM_90 893 -#define IMG_CUSTOM_90_EDITOR 894 -#define IMG_CUSTOM_91 895 -#define IMG_CUSTOM_91_EDITOR 896 -#define IMG_CUSTOM_92 897 -#define IMG_CUSTOM_92_EDITOR 898 -#define IMG_CUSTOM_93 899 -#define IMG_CUSTOM_93_EDITOR 900 -#define IMG_CUSTOM_94 901 -#define IMG_CUSTOM_94_EDITOR 902 -#define IMG_CUSTOM_95 903 -#define IMG_CUSTOM_95_EDITOR 904 -#define IMG_CUSTOM_96 905 -#define IMG_CUSTOM_96_EDITOR 906 -#define IMG_CUSTOM_97 907 -#define IMG_CUSTOM_97_EDITOR 908 -#define IMG_CUSTOM_98 909 -#define IMG_CUSTOM_98_EDITOR 910 -#define IMG_CUSTOM_99 911 -#define IMG_CUSTOM_99_EDITOR 912 -#define IMG_CUSTOM_100 913 -#define IMG_CUSTOM_100_EDITOR 914 -#define IMG_CUSTOM_101 915 -#define IMG_CUSTOM_101_EDITOR 916 -#define IMG_CUSTOM_102 917 -#define IMG_CUSTOM_102_EDITOR 918 -#define IMG_CUSTOM_103 919 -#define IMG_CUSTOM_103_EDITOR 920 -#define IMG_CUSTOM_104 921 -#define IMG_CUSTOM_104_EDITOR 922 -#define IMG_CUSTOM_105 923 -#define IMG_CUSTOM_105_EDITOR 924 -#define IMG_CUSTOM_106 925 -#define IMG_CUSTOM_106_EDITOR 926 -#define IMG_CUSTOM_107 927 -#define IMG_CUSTOM_107_EDITOR 928 -#define IMG_CUSTOM_108 929 -#define IMG_CUSTOM_108_EDITOR 930 -#define IMG_CUSTOM_109 931 -#define IMG_CUSTOM_109_EDITOR 932 -#define IMG_CUSTOM_110 933 -#define IMG_CUSTOM_110_EDITOR 934 -#define IMG_CUSTOM_111 935 -#define IMG_CUSTOM_111_EDITOR 936 -#define IMG_CUSTOM_112 937 -#define IMG_CUSTOM_112_EDITOR 938 -#define IMG_CUSTOM_113 939 -#define IMG_CUSTOM_113_EDITOR 940 -#define IMG_CUSTOM_114 941 -#define IMG_CUSTOM_114_EDITOR 942 -#define IMG_CUSTOM_115 943 -#define IMG_CUSTOM_115_EDITOR 944 -#define IMG_CUSTOM_116 945 -#define IMG_CUSTOM_116_EDITOR 946 -#define IMG_CUSTOM_117 947 -#define IMG_CUSTOM_117_EDITOR 948 -#define IMG_CUSTOM_118 949 -#define IMG_CUSTOM_118_EDITOR 950 -#define IMG_CUSTOM_119 951 -#define IMG_CUSTOM_119_EDITOR 952 -#define IMG_CUSTOM_120 953 -#define IMG_CUSTOM_120_EDITOR 954 -#define IMG_CUSTOM_121 955 -#define IMG_CUSTOM_121_EDITOR 956 -#define IMG_CUSTOM_122 957 -#define IMG_CUSTOM_122_EDITOR 958 -#define IMG_CUSTOM_123 959 -#define IMG_CUSTOM_123_EDITOR 960 -#define IMG_CUSTOM_124 961 -#define IMG_CUSTOM_124_EDITOR 962 -#define IMG_CUSTOM_125 963 -#define IMG_CUSTOM_125_EDITOR 964 -#define IMG_CUSTOM_126 965 -#define IMG_CUSTOM_126_EDITOR 966 -#define IMG_CUSTOM_127 967 -#define IMG_CUSTOM_127_EDITOR 968 -#define IMG_CUSTOM_128 969 -#define IMG_CUSTOM_128_EDITOR 970 -#define IMG_CUSTOM_129 971 -#define IMG_CUSTOM_129_EDITOR 972 -#define IMG_CUSTOM_130 973 -#define IMG_CUSTOM_130_EDITOR 974 -#define IMG_CUSTOM_131 975 -#define IMG_CUSTOM_131_EDITOR 976 -#define IMG_CUSTOM_132 977 -#define IMG_CUSTOM_132_EDITOR 978 -#define IMG_CUSTOM_133 979 -#define IMG_CUSTOM_133_EDITOR 980 -#define IMG_CUSTOM_134 981 -#define IMG_CUSTOM_134_EDITOR 982 -#define IMG_CUSTOM_135 983 -#define IMG_CUSTOM_135_EDITOR 984 -#define IMG_CUSTOM_136 985 -#define IMG_CUSTOM_136_EDITOR 986 -#define IMG_CUSTOM_137 987 -#define IMG_CUSTOM_137_EDITOR 988 -#define IMG_CUSTOM_138 989 -#define IMG_CUSTOM_138_EDITOR 990 -#define IMG_CUSTOM_139 991 -#define IMG_CUSTOM_139_EDITOR 992 -#define IMG_CUSTOM_140 993 -#define IMG_CUSTOM_140_EDITOR 994 -#define IMG_CUSTOM_141 995 -#define IMG_CUSTOM_141_EDITOR 996 -#define IMG_CUSTOM_142 997 -#define IMG_CUSTOM_142_EDITOR 998 -#define IMG_CUSTOM_143 999 -#define IMG_CUSTOM_143_EDITOR 1000 -#define IMG_CUSTOM_144 1001 -#define IMG_CUSTOM_144_EDITOR 1002 -#define IMG_CUSTOM_145 1003 -#define IMG_CUSTOM_145_EDITOR 1004 -#define IMG_CUSTOM_146 1005 -#define IMG_CUSTOM_146_EDITOR 1006 -#define IMG_CUSTOM_147 1007 -#define IMG_CUSTOM_147_EDITOR 1008 -#define IMG_CUSTOM_148 1009 -#define IMG_CUSTOM_148_EDITOR 1010 -#define IMG_CUSTOM_149 1011 -#define IMG_CUSTOM_149_EDITOR 1012 -#define IMG_CUSTOM_150 1013 -#define IMG_CUSTOM_150_EDITOR 1014 -#define IMG_CUSTOM_151 1015 -#define IMG_CUSTOM_151_EDITOR 1016 -#define IMG_CUSTOM_152 1017 -#define IMG_CUSTOM_152_EDITOR 1018 -#define IMG_CUSTOM_153 1019 -#define IMG_CUSTOM_153_EDITOR 1020 -#define IMG_CUSTOM_154 1021 -#define IMG_CUSTOM_154_EDITOR 1022 -#define IMG_CUSTOM_155 1023 -#define IMG_CUSTOM_155_EDITOR 1024 -#define IMG_CUSTOM_156 1025 -#define IMG_CUSTOM_156_EDITOR 1026 -#define IMG_CUSTOM_157 1027 -#define IMG_CUSTOM_157_EDITOR 1028 -#define IMG_CUSTOM_158 1029 -#define IMG_CUSTOM_158_EDITOR 1030 -#define IMG_CUSTOM_159 1031 -#define IMG_CUSTOM_159_EDITOR 1032 -#define IMG_CUSTOM_160 1033 -#define IMG_CUSTOM_160_EDITOR 1034 -#define IMG_CUSTOM_161 1035 -#define IMG_CUSTOM_161_EDITOR 1036 -#define IMG_CUSTOM_162 1037 -#define IMG_CUSTOM_162_EDITOR 1038 -#define IMG_CUSTOM_163 1039 -#define IMG_CUSTOM_163_EDITOR 1040 -#define IMG_CUSTOM_164 1041 -#define IMG_CUSTOM_164_EDITOR 1042 -#define IMG_CUSTOM_165 1043 -#define IMG_CUSTOM_165_EDITOR 1044 -#define IMG_CUSTOM_166 1045 -#define IMG_CUSTOM_166_EDITOR 1046 -#define IMG_CUSTOM_167 1047 -#define IMG_CUSTOM_167_EDITOR 1048 -#define IMG_CUSTOM_168 1049 -#define IMG_CUSTOM_168_EDITOR 1050 -#define IMG_CUSTOM_169 1051 -#define IMG_CUSTOM_169_EDITOR 1052 -#define IMG_CUSTOM_170 1053 -#define IMG_CUSTOM_170_EDITOR 1054 -#define IMG_CUSTOM_171 1055 -#define IMG_CUSTOM_171_EDITOR 1056 -#define IMG_CUSTOM_172 1057 -#define IMG_CUSTOM_172_EDITOR 1058 -#define IMG_CUSTOM_173 1059 -#define IMG_CUSTOM_173_EDITOR 1060 -#define IMG_CUSTOM_174 1061 -#define IMG_CUSTOM_174_EDITOR 1062 -#define IMG_CUSTOM_175 1063 -#define IMG_CUSTOM_175_EDITOR 1064 -#define IMG_CUSTOM_176 1065 -#define IMG_CUSTOM_176_EDITOR 1066 -#define IMG_CUSTOM_177 1067 -#define IMG_CUSTOM_177_EDITOR 1068 -#define IMG_CUSTOM_178 1069 -#define IMG_CUSTOM_178_EDITOR 1070 -#define IMG_CUSTOM_179 1071 -#define IMG_CUSTOM_179_EDITOR 1072 -#define IMG_CUSTOM_180 1073 -#define IMG_CUSTOM_180_EDITOR 1074 -#define IMG_CUSTOM_181 1075 -#define IMG_CUSTOM_181_EDITOR 1076 -#define IMG_CUSTOM_182 1077 -#define IMG_CUSTOM_182_EDITOR 1078 -#define IMG_CUSTOM_183 1079 -#define IMG_CUSTOM_183_EDITOR 1080 -#define IMG_CUSTOM_184 1081 -#define IMG_CUSTOM_184_EDITOR 1082 -#define IMG_CUSTOM_185 1083 -#define IMG_CUSTOM_185_EDITOR 1084 -#define IMG_CUSTOM_186 1085 -#define IMG_CUSTOM_186_EDITOR 1086 -#define IMG_CUSTOM_187 1087 -#define IMG_CUSTOM_187_EDITOR 1088 -#define IMG_CUSTOM_188 1089 -#define IMG_CUSTOM_188_EDITOR 1090 -#define IMG_CUSTOM_189 1091 -#define IMG_CUSTOM_189_EDITOR 1092 -#define IMG_CUSTOM_190 1093 -#define IMG_CUSTOM_190_EDITOR 1094 -#define IMG_CUSTOM_191 1095 -#define IMG_CUSTOM_191_EDITOR 1096 -#define IMG_CUSTOM_192 1097 -#define IMG_CUSTOM_192_EDITOR 1098 -#define IMG_CUSTOM_193 1099 -#define IMG_CUSTOM_193_EDITOR 1100 -#define IMG_CUSTOM_194 1101 -#define IMG_CUSTOM_194_EDITOR 1102 -#define IMG_CUSTOM_195 1103 -#define IMG_CUSTOM_195_EDITOR 1104 -#define IMG_CUSTOM_196 1105 -#define IMG_CUSTOM_196_EDITOR 1106 -#define IMG_CUSTOM_197 1107 -#define IMG_CUSTOM_197_EDITOR 1108 -#define IMG_CUSTOM_198 1109 -#define IMG_CUSTOM_198_EDITOR 1110 -#define IMG_CUSTOM_199 1111 -#define IMG_CUSTOM_199_EDITOR 1112 -#define IMG_CUSTOM_200 1113 -#define IMG_CUSTOM_200_EDITOR 1114 -#define IMG_CUSTOM_201 1115 -#define IMG_CUSTOM_201_EDITOR 1116 -#define IMG_CUSTOM_202 1117 -#define IMG_CUSTOM_202_EDITOR 1118 -#define IMG_CUSTOM_203 1119 -#define IMG_CUSTOM_203_EDITOR 1120 -#define IMG_CUSTOM_204 1121 -#define IMG_CUSTOM_204_EDITOR 1122 -#define IMG_CUSTOM_205 1123 -#define IMG_CUSTOM_205_EDITOR 1124 -#define IMG_CUSTOM_206 1125 -#define IMG_CUSTOM_206_EDITOR 1126 -#define IMG_CUSTOM_207 1127 -#define IMG_CUSTOM_207_EDITOR 1128 -#define IMG_CUSTOM_208 1129 -#define IMG_CUSTOM_208_EDITOR 1130 -#define IMG_CUSTOM_209 1131 -#define IMG_CUSTOM_209_EDITOR 1132 -#define IMG_CUSTOM_210 1133 -#define IMG_CUSTOM_210_EDITOR 1134 -#define IMG_CUSTOM_211 1135 -#define IMG_CUSTOM_211_EDITOR 1136 -#define IMG_CUSTOM_212 1137 -#define IMG_CUSTOM_212_EDITOR 1138 -#define IMG_CUSTOM_213 1139 -#define IMG_CUSTOM_213_EDITOR 1140 -#define IMG_CUSTOM_214 1141 -#define IMG_CUSTOM_214_EDITOR 1142 -#define IMG_CUSTOM_215 1143 -#define IMG_CUSTOM_215_EDITOR 1144 -#define IMG_CUSTOM_216 1145 -#define IMG_CUSTOM_216_EDITOR 1146 -#define IMG_CUSTOM_217 1147 -#define IMG_CUSTOM_217_EDITOR 1148 -#define IMG_CUSTOM_218 1149 -#define IMG_CUSTOM_218_EDITOR 1150 -#define IMG_CUSTOM_219 1151 -#define IMG_CUSTOM_219_EDITOR 1152 -#define IMG_CUSTOM_220 1153 -#define IMG_CUSTOM_220_EDITOR 1154 -#define IMG_CUSTOM_221 1155 -#define IMG_CUSTOM_221_EDITOR 1156 -#define IMG_CUSTOM_222 1157 -#define IMG_CUSTOM_222_EDITOR 1158 -#define IMG_CUSTOM_223 1159 -#define IMG_CUSTOM_223_EDITOR 1160 -#define IMG_CUSTOM_224 1161 -#define IMG_CUSTOM_224_EDITOR 1162 -#define IMG_CUSTOM_225 1163 -#define IMG_CUSTOM_225_EDITOR 1164 -#define IMG_CUSTOM_226 1165 -#define IMG_CUSTOM_226_EDITOR 1166 -#define IMG_CUSTOM_227 1167 -#define IMG_CUSTOM_227_EDITOR 1168 -#define IMG_CUSTOM_228 1169 -#define IMG_CUSTOM_228_EDITOR 1170 -#define IMG_CUSTOM_229 1171 -#define IMG_CUSTOM_229_EDITOR 1172 -#define IMG_CUSTOM_230 1173 -#define IMG_CUSTOM_230_EDITOR 1174 -#define IMG_CUSTOM_231 1175 -#define IMG_CUSTOM_231_EDITOR 1176 -#define IMG_CUSTOM_232 1177 -#define IMG_CUSTOM_232_EDITOR 1178 -#define IMG_CUSTOM_233 1179 -#define IMG_CUSTOM_233_EDITOR 1180 -#define IMG_CUSTOM_234 1181 -#define IMG_CUSTOM_234_EDITOR 1182 -#define IMG_CUSTOM_235 1183 -#define IMG_CUSTOM_235_EDITOR 1184 -#define IMG_CUSTOM_236 1185 -#define IMG_CUSTOM_236_EDITOR 1186 -#define IMG_CUSTOM_237 1187 -#define IMG_CUSTOM_237_EDITOR 1188 -#define IMG_CUSTOM_238 1189 -#define IMG_CUSTOM_238_EDITOR 1190 -#define IMG_CUSTOM_239 1191 -#define IMG_CUSTOM_239_EDITOR 1192 -#define IMG_CUSTOM_240 1193 -#define IMG_CUSTOM_240_EDITOR 1194 -#define IMG_CUSTOM_241 1195 -#define IMG_CUSTOM_241_EDITOR 1196 -#define IMG_CUSTOM_242 1197 -#define IMG_CUSTOM_242_EDITOR 1198 -#define IMG_CUSTOM_243 1199 -#define IMG_CUSTOM_243_EDITOR 1200 -#define IMG_CUSTOM_244 1201 -#define IMG_CUSTOM_244_EDITOR 1202 -#define IMG_CUSTOM_245 1203 -#define IMG_CUSTOM_245_EDITOR 1204 -#define IMG_CUSTOM_246 1205 -#define IMG_CUSTOM_246_EDITOR 1206 -#define IMG_CUSTOM_247 1207 -#define IMG_CUSTOM_247_EDITOR 1208 -#define IMG_CUSTOM_248 1209 -#define IMG_CUSTOM_248_EDITOR 1210 -#define IMG_CUSTOM_249 1211 -#define IMG_CUSTOM_249_EDITOR 1212 -#define IMG_CUSTOM_250 1213 -#define IMG_CUSTOM_250_EDITOR 1214 -#define IMG_CUSTOM_251 1215 -#define IMG_CUSTOM_251_EDITOR 1216 -#define IMG_CUSTOM_252 1217 -#define IMG_CUSTOM_252_EDITOR 1218 -#define IMG_CUSTOM_253 1219 -#define IMG_CUSTOM_253_EDITOR 1220 -#define IMG_CUSTOM_254 1221 -#define IMG_CUSTOM_254_EDITOR 1222 -#define IMG_CUSTOM_255 1223 -#define IMG_CUSTOM_255_EDITOR 1224 -#define IMG_CUSTOM_256 1225 -#define IMG_CUSTOM_256_EDITOR 1226 -#define IMG_GROUP_1 1227 -#define IMG_GROUP_1_EDITOR 1228 -#define IMG_GROUP_2 1229 -#define IMG_GROUP_2_EDITOR 1230 -#define IMG_GROUP_3 1231 -#define IMG_GROUP_3_EDITOR 1232 -#define IMG_GROUP_4 1233 -#define IMG_GROUP_4_EDITOR 1234 -#define IMG_GROUP_5 1235 -#define IMG_GROUP_5_EDITOR 1236 -#define IMG_GROUP_6 1237 -#define IMG_GROUP_6_EDITOR 1238 -#define IMG_GROUP_7 1239 -#define IMG_GROUP_7_EDITOR 1240 -#define IMG_GROUP_8 1241 -#define IMG_GROUP_8_EDITOR 1242 -#define IMG_GROUP_9 1243 -#define IMG_GROUP_9_EDITOR 1244 -#define IMG_GROUP_10 1245 -#define IMG_GROUP_10_EDITOR 1246 -#define IMG_GROUP_11 1247 -#define IMG_GROUP_11_EDITOR 1248 -#define IMG_GROUP_12 1249 -#define IMG_GROUP_12_EDITOR 1250 -#define IMG_GROUP_13 1251 -#define IMG_GROUP_13_EDITOR 1252 -#define IMG_GROUP_14 1253 -#define IMG_GROUP_14_EDITOR 1254 -#define IMG_GROUP_15 1255 -#define IMG_GROUP_15_EDITOR 1256 -#define IMG_GROUP_16 1257 -#define IMG_GROUP_16_EDITOR 1258 -#define IMG_GROUP_17 1259 -#define IMG_GROUP_17_EDITOR 1260 -#define IMG_GROUP_18 1261 -#define IMG_GROUP_18_EDITOR 1262 -#define IMG_GROUP_19 1263 -#define IMG_GROUP_19_EDITOR 1264 -#define IMG_GROUP_20 1265 -#define IMG_GROUP_20_EDITOR 1266 -#define IMG_GROUP_21 1267 -#define IMG_GROUP_21_EDITOR 1268 -#define IMG_GROUP_22 1269 -#define IMG_GROUP_22_EDITOR 1270 -#define IMG_GROUP_23 1271 -#define IMG_GROUP_23_EDITOR 1272 -#define IMG_GROUP_24 1273 -#define IMG_GROUP_24_EDITOR 1274 -#define IMG_GROUP_25 1275 -#define IMG_GROUP_25_EDITOR 1276 -#define IMG_GROUP_26 1277 -#define IMG_GROUP_26_EDITOR 1278 -#define IMG_GROUP_27 1279 -#define IMG_GROUP_27_EDITOR 1280 -#define IMG_GROUP_28 1281 -#define IMG_GROUP_28_EDITOR 1282 -#define IMG_GROUP_29 1283 -#define IMG_GROUP_29_EDITOR 1284 -#define IMG_GROUP_30 1285 -#define IMG_GROUP_30_EDITOR 1286 -#define IMG_GROUP_31 1287 -#define IMG_GROUP_31_EDITOR 1288 -#define IMG_GROUP_32 1289 -#define IMG_GROUP_32_EDITOR 1290 -#define IMG_TOON_1 1291 -#define IMG_TOON_2 1292 -#define IMG_TOON_3 1293 -#define IMG_TOON_4 1294 -#define IMG_TOON_5 1295 -#define IMG_TOON_6 1296 -#define IMG_TOON_7 1297 -#define IMG_TOON_8 1298 -#define IMG_TOON_9 1299 -#define IMG_TOON_10 1300 -#define IMG_TOON_11 1301 -#define IMG_TOON_12 1302 -#define IMG_TOON_13 1303 -#define IMG_TOON_14 1304 -#define IMG_TOON_15 1305 -#define IMG_TOON_16 1306 -#define IMG_TOON_17 1307 -#define IMG_TOON_18 1308 -#define IMG_TOON_19 1309 -#define IMG_TOON_20 1310 -#define IMG_MENU_CALIBRATE_RED 1311 -#define IMG_MENU_CALIBRATE_BLUE 1312 -#define IMG_MENU_CALIBRATE_YELLOW 1313 -#define IMG_MENU_BUTTON 1314 -#define IMG_MENU_BUTTON_ACTIVE 1315 -#define IMG_MENU_BUTTON_LEFT 1316 -#define IMG_MENU_BUTTON_RIGHT 1317 -#define IMG_MENU_BUTTON_UP 1318 -#define IMG_MENU_BUTTON_DOWN 1319 -#define IMG_MENU_BUTTON_LEFT_ACTIVE 1320 -#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1321 -#define IMG_MENU_BUTTON_UP_ACTIVE 1322 -#define IMG_MENU_BUTTON_DOWN_ACTIVE 1323 -#define IMG_MENU_SCROLLBAR 1324 -#define IMG_MENU_SCROLLBAR_ACTIVE 1325 -#define IMG_FONT_INITIAL_1 1326 -#define IMG_FONT_INITIAL_2 1327 -#define IMG_FONT_INITIAL_3 1328 -#define IMG_FONT_INITIAL_4 1329 -#define IMG_FONT_TITLE_1 1330 -#define IMG_FONT_TITLE_1_LEVELS 1331 -#define IMG_FONT_TITLE_2 1332 -#define IMG_FONT_MENU_1 1333 -#define IMG_FONT_MENU_2 1334 -#define IMG_FONT_TEXT_1 1335 -#define IMG_FONT_TEXT_1_LEVELS 1336 -#define IMG_FONT_TEXT_1_PREVIEW 1337 -#define IMG_FONT_TEXT_1_SCORES 1338 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1339 -#define IMG_FONT_TEXT_2 1340 -#define IMG_FONT_TEXT_2_LEVELS 1341 -#define IMG_FONT_TEXT_2_PREVIEW 1342 -#define IMG_FONT_TEXT_2_SCORES 1343 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1344 -#define IMG_FONT_TEXT_3 1345 -#define IMG_FONT_TEXT_3_LEVELS 1346 -#define IMG_FONT_TEXT_3_PREVIEW 1347 -#define IMG_FONT_TEXT_3_SCORES 1348 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1349 -#define IMG_FONT_TEXT_4 1350 -#define IMG_FONT_TEXT_4_LEVELS 1351 -#define IMG_FONT_TEXT_4_SCORES 1352 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1353 -#define IMG_FONT_ENVELOPE_1 1354 -#define IMG_FONT_ENVELOPE_2 1355 -#define IMG_FONT_ENVELOPE_3 1356 -#define IMG_FONT_ENVELOPE_4 1357 -#define IMG_FONT_INPUT_1 1358 -#define IMG_FONT_INPUT_1_MAIN 1359 -#define IMG_FONT_INPUT_1_ACTIVE 1360 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1361 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1362 -#define IMG_FONT_INPUT_2 1363 -#define IMG_FONT_INPUT_2_ACTIVE 1364 -#define IMG_FONT_OPTION_OFF 1365 -#define IMG_FONT_OPTION_ON 1366 -#define IMG_FONT_VALUE_1 1367 -#define IMG_FONT_VALUE_2 1368 -#define IMG_FONT_VALUE_OLD 1369 -#define IMG_FONT_LEVEL_NUMBER 1370 -#define IMG_FONT_TAPE_RECORDER 1371 -#define IMG_FONT_GAME_INFO 1372 -#define IMG_GLOBAL_BORDER 1373 -#define IMG_GLOBAL_DOOR 1374 -#define IMG_EDITOR_ELEMENT_BORDER 1375 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1376 -#define IMG_BACKGROUND_ENVELOPE_1 1377 -#define IMG_BACKGROUND_ENVELOPE_2 1378 -#define IMG_BACKGROUND_ENVELOPE_3 1379 -#define IMG_BACKGROUND_ENVELOPE_4 1380 -#define IMG_BACKGROUND 1381 -#define IMG_BACKGROUND_MAIN 1382 -#define IMG_BACKGROUND_LEVELS 1383 -#define IMG_BACKGROUND_SCORES 1384 -#define IMG_BACKGROUND_EDITOR 1385 -#define IMG_BACKGROUND_INFO 1386 -#define IMG_BACKGROUND_SETUP 1387 -#define IMG_BACKGROUND_DOOR 1388 +#define IMG_CHAR_SPACE 640 +#define IMG_CHAR_EXCLAM 641 +#define IMG_CHAR_QUOTEDBL 642 +#define IMG_CHAR_NUMBERSIGN 643 +#define IMG_CHAR_DOLLAR 644 +#define IMG_CHAR_PROCENT 645 +#define IMG_CHAR_AMPERSAND 646 +#define IMG_CHAR_APOSTROPHE 647 +#define IMG_CHAR_PARENLEFT 648 +#define IMG_CHAR_PARENRIGHT 649 +#define IMG_CHAR_ASTERISK 650 +#define IMG_CHAR_PLUS 651 +#define IMG_CHAR_COMMA 652 +#define IMG_CHAR_MINUS 653 +#define IMG_CHAR_PERIOD 654 +#define IMG_CHAR_SLASH 655 +#define IMG_CHAR_0 656 +#define IMG_CHAR_1 657 +#define IMG_CHAR_2 658 +#define IMG_CHAR_3 659 +#define IMG_CHAR_4 660 +#define IMG_CHAR_5 661 +#define IMG_CHAR_6 662 +#define IMG_CHAR_7 663 +#define IMG_CHAR_8 664 +#define IMG_CHAR_9 665 +#define IMG_CHAR_COLON 666 +#define IMG_CHAR_SEMICOLON 667 +#define IMG_CHAR_LESS 668 +#define IMG_CHAR_EQUAL 669 +#define IMG_CHAR_GREATER 670 +#define IMG_CHAR_QUESTION 671 +#define IMG_CHAR_AT 672 +#define IMG_CHAR_A 673 +#define IMG_CHAR_B 674 +#define IMG_CHAR_C 675 +#define IMG_CHAR_D 676 +#define IMG_CHAR_E 677 +#define IMG_CHAR_F 678 +#define IMG_CHAR_G 679 +#define IMG_CHAR_H 680 +#define IMG_CHAR_I 681 +#define IMG_CHAR_J 682 +#define IMG_CHAR_K 683 +#define IMG_CHAR_L 684 +#define IMG_CHAR_M 685 +#define IMG_CHAR_N 686 +#define IMG_CHAR_O 687 +#define IMG_CHAR_P 688 +#define IMG_CHAR_Q 689 +#define IMG_CHAR_R 690 +#define IMG_CHAR_S 691 +#define IMG_CHAR_T 692 +#define IMG_CHAR_U 693 +#define IMG_CHAR_V 694 +#define IMG_CHAR_W 695 +#define IMG_CHAR_X 696 +#define IMG_CHAR_Y 697 +#define IMG_CHAR_Z 698 +#define IMG_CHAR_BRACKETLEFT 699 +#define IMG_CHAR_BACKSLASH 700 +#define IMG_CHAR_BRACKETRIGHT 701 +#define IMG_CHAR_ASCIICIRCUM 702 +#define IMG_CHAR_UNDERSCORE 703 +#define IMG_CHAR_COPYRIGHT 704 +#define IMG_CHAR_AUMLAUT 705 +#define IMG_CHAR_OUMLAUT 706 +#define IMG_CHAR_UUMLAUT 707 +#define IMG_CHAR_DEGREE 708 +#define IMG_CHAR_TRADEMARK 709 +#define IMG_CHAR_CURSOR 710 +#define IMG_CUSTOM_1 711 +#define IMG_CUSTOM_1_EDITOR 712 +#define IMG_CUSTOM_2 713 +#define IMG_CUSTOM_2_EDITOR 714 +#define IMG_CUSTOM_3 715 +#define IMG_CUSTOM_3_EDITOR 716 +#define IMG_CUSTOM_4 717 +#define IMG_CUSTOM_4_EDITOR 718 +#define IMG_CUSTOM_5 719 +#define IMG_CUSTOM_5_EDITOR 720 +#define IMG_CUSTOM_6 721 +#define IMG_CUSTOM_6_EDITOR 722 +#define IMG_CUSTOM_7 723 +#define IMG_CUSTOM_7_EDITOR 724 +#define IMG_CUSTOM_8 725 +#define IMG_CUSTOM_8_EDITOR 726 +#define IMG_CUSTOM_9 727 +#define IMG_CUSTOM_9_EDITOR 728 +#define IMG_CUSTOM_10 729 +#define IMG_CUSTOM_10_EDITOR 730 +#define IMG_CUSTOM_11 731 +#define IMG_CUSTOM_11_EDITOR 732 +#define IMG_CUSTOM_12 733 +#define IMG_CUSTOM_12_EDITOR 734 +#define IMG_CUSTOM_13 735 +#define IMG_CUSTOM_13_EDITOR 736 +#define IMG_CUSTOM_14 737 +#define IMG_CUSTOM_14_EDITOR 738 +#define IMG_CUSTOM_15 739 +#define IMG_CUSTOM_15_EDITOR 740 +#define IMG_CUSTOM_16 741 +#define IMG_CUSTOM_16_EDITOR 742 +#define IMG_CUSTOM_17 743 +#define IMG_CUSTOM_17_EDITOR 744 +#define IMG_CUSTOM_18 745 +#define IMG_CUSTOM_18_EDITOR 746 +#define IMG_CUSTOM_19 747 +#define IMG_CUSTOM_19_EDITOR 748 +#define IMG_CUSTOM_20 749 +#define IMG_CUSTOM_20_EDITOR 750 +#define IMG_CUSTOM_21 751 +#define IMG_CUSTOM_21_EDITOR 752 +#define IMG_CUSTOM_22 753 +#define IMG_CUSTOM_22_EDITOR 754 +#define IMG_CUSTOM_23 755 +#define IMG_CUSTOM_23_EDITOR 756 +#define IMG_CUSTOM_24 757 +#define IMG_CUSTOM_24_EDITOR 758 +#define IMG_CUSTOM_25 759 +#define IMG_CUSTOM_25_EDITOR 760 +#define IMG_CUSTOM_26 761 +#define IMG_CUSTOM_26_EDITOR 762 +#define IMG_CUSTOM_27 763 +#define IMG_CUSTOM_27_EDITOR 764 +#define IMG_CUSTOM_28 765 +#define IMG_CUSTOM_28_EDITOR 766 +#define IMG_CUSTOM_29 767 +#define IMG_CUSTOM_29_EDITOR 768 +#define IMG_CUSTOM_30 769 +#define IMG_CUSTOM_30_EDITOR 770 +#define IMG_CUSTOM_31 771 +#define IMG_CUSTOM_31_EDITOR 772 +#define IMG_CUSTOM_32 773 +#define IMG_CUSTOM_32_EDITOR 774 +#define IMG_CUSTOM_33 775 +#define IMG_CUSTOM_33_EDITOR 776 +#define IMG_CUSTOM_34 777 +#define IMG_CUSTOM_34_EDITOR 778 +#define IMG_CUSTOM_35 779 +#define IMG_CUSTOM_35_EDITOR 780 +#define IMG_CUSTOM_36 781 +#define IMG_CUSTOM_36_EDITOR 782 +#define IMG_CUSTOM_37 783 +#define IMG_CUSTOM_37_EDITOR 784 +#define IMG_CUSTOM_38 785 +#define IMG_CUSTOM_38_EDITOR 786 +#define IMG_CUSTOM_39 787 +#define IMG_CUSTOM_39_EDITOR 788 +#define IMG_CUSTOM_40 789 +#define IMG_CUSTOM_40_EDITOR 790 +#define IMG_CUSTOM_41 791 +#define IMG_CUSTOM_41_EDITOR 792 +#define IMG_CUSTOM_42 793 +#define IMG_CUSTOM_42_EDITOR 794 +#define IMG_CUSTOM_43 795 +#define IMG_CUSTOM_43_EDITOR 796 +#define IMG_CUSTOM_44 797 +#define IMG_CUSTOM_44_EDITOR 798 +#define IMG_CUSTOM_45 799 +#define IMG_CUSTOM_45_EDITOR 800 +#define IMG_CUSTOM_46 801 +#define IMG_CUSTOM_46_EDITOR 802 +#define IMG_CUSTOM_47 803 +#define IMG_CUSTOM_47_EDITOR 804 +#define IMG_CUSTOM_48 805 +#define IMG_CUSTOM_48_EDITOR 806 +#define IMG_CUSTOM_49 807 +#define IMG_CUSTOM_49_EDITOR 808 +#define IMG_CUSTOM_50 809 +#define IMG_CUSTOM_50_EDITOR 810 +#define IMG_CUSTOM_51 811 +#define IMG_CUSTOM_51_EDITOR 812 +#define IMG_CUSTOM_52 813 +#define IMG_CUSTOM_52_EDITOR 814 +#define IMG_CUSTOM_53 815 +#define IMG_CUSTOM_53_EDITOR 816 +#define IMG_CUSTOM_54 817 +#define IMG_CUSTOM_54_EDITOR 818 +#define IMG_CUSTOM_55 819 +#define IMG_CUSTOM_55_EDITOR 820 +#define IMG_CUSTOM_56 821 +#define IMG_CUSTOM_56_EDITOR 822 +#define IMG_CUSTOM_57 823 +#define IMG_CUSTOM_57_EDITOR 824 +#define IMG_CUSTOM_58 825 +#define IMG_CUSTOM_58_EDITOR 826 +#define IMG_CUSTOM_59 827 +#define IMG_CUSTOM_59_EDITOR 828 +#define IMG_CUSTOM_60 829 +#define IMG_CUSTOM_60_EDITOR 830 +#define IMG_CUSTOM_61 831 +#define IMG_CUSTOM_61_EDITOR 832 +#define IMG_CUSTOM_62 833 +#define IMG_CUSTOM_62_EDITOR 834 +#define IMG_CUSTOM_63 835 +#define IMG_CUSTOM_63_EDITOR 836 +#define IMG_CUSTOM_64 837 +#define IMG_CUSTOM_64_EDITOR 838 +#define IMG_CUSTOM_65 839 +#define IMG_CUSTOM_65_EDITOR 840 +#define IMG_CUSTOM_66 841 +#define IMG_CUSTOM_66_EDITOR 842 +#define IMG_CUSTOM_67 843 +#define IMG_CUSTOM_67_EDITOR 844 +#define IMG_CUSTOM_68 845 +#define IMG_CUSTOM_68_EDITOR 846 +#define IMG_CUSTOM_69 847 +#define IMG_CUSTOM_69_EDITOR 848 +#define IMG_CUSTOM_70 849 +#define IMG_CUSTOM_70_EDITOR 850 +#define IMG_CUSTOM_71 851 +#define IMG_CUSTOM_71_EDITOR 852 +#define IMG_CUSTOM_72 853 +#define IMG_CUSTOM_72_EDITOR 854 +#define IMG_CUSTOM_73 855 +#define IMG_CUSTOM_73_EDITOR 856 +#define IMG_CUSTOM_74 857 +#define IMG_CUSTOM_74_EDITOR 858 +#define IMG_CUSTOM_75 859 +#define IMG_CUSTOM_75_EDITOR 860 +#define IMG_CUSTOM_76 861 +#define IMG_CUSTOM_76_EDITOR 862 +#define IMG_CUSTOM_77 863 +#define IMG_CUSTOM_77_EDITOR 864 +#define IMG_CUSTOM_78 865 +#define IMG_CUSTOM_78_EDITOR 866 +#define IMG_CUSTOM_79 867 +#define IMG_CUSTOM_79_EDITOR 868 +#define IMG_CUSTOM_80 869 +#define IMG_CUSTOM_80_EDITOR 870 +#define IMG_CUSTOM_81 871 +#define IMG_CUSTOM_81_EDITOR 872 +#define IMG_CUSTOM_82 873 +#define IMG_CUSTOM_82_EDITOR 874 +#define IMG_CUSTOM_83 875 +#define IMG_CUSTOM_83_EDITOR 876 +#define IMG_CUSTOM_84 877 +#define IMG_CUSTOM_84_EDITOR 878 +#define IMG_CUSTOM_85 879 +#define IMG_CUSTOM_85_EDITOR 880 +#define IMG_CUSTOM_86 881 +#define IMG_CUSTOM_86_EDITOR 882 +#define IMG_CUSTOM_87 883 +#define IMG_CUSTOM_87_EDITOR 884 +#define IMG_CUSTOM_88 885 +#define IMG_CUSTOM_88_EDITOR 886 +#define IMG_CUSTOM_89 887 +#define IMG_CUSTOM_89_EDITOR 888 +#define IMG_CUSTOM_90 889 +#define IMG_CUSTOM_90_EDITOR 890 +#define IMG_CUSTOM_91 891 +#define IMG_CUSTOM_91_EDITOR 892 +#define IMG_CUSTOM_92 893 +#define IMG_CUSTOM_92_EDITOR 894 +#define IMG_CUSTOM_93 895 +#define IMG_CUSTOM_93_EDITOR 896 +#define IMG_CUSTOM_94 897 +#define IMG_CUSTOM_94_EDITOR 898 +#define IMG_CUSTOM_95 899 +#define IMG_CUSTOM_95_EDITOR 900 +#define IMG_CUSTOM_96 901 +#define IMG_CUSTOM_96_EDITOR 902 +#define IMG_CUSTOM_97 903 +#define IMG_CUSTOM_97_EDITOR 904 +#define IMG_CUSTOM_98 905 +#define IMG_CUSTOM_98_EDITOR 906 +#define IMG_CUSTOM_99 907 +#define IMG_CUSTOM_99_EDITOR 908 +#define IMG_CUSTOM_100 909 +#define IMG_CUSTOM_100_EDITOR 910 +#define IMG_CUSTOM_101 911 +#define IMG_CUSTOM_101_EDITOR 912 +#define IMG_CUSTOM_102 913 +#define IMG_CUSTOM_102_EDITOR 914 +#define IMG_CUSTOM_103 915 +#define IMG_CUSTOM_103_EDITOR 916 +#define IMG_CUSTOM_104 917 +#define IMG_CUSTOM_104_EDITOR 918 +#define IMG_CUSTOM_105 919 +#define IMG_CUSTOM_105_EDITOR 920 +#define IMG_CUSTOM_106 921 +#define IMG_CUSTOM_106_EDITOR 922 +#define IMG_CUSTOM_107 923 +#define IMG_CUSTOM_107_EDITOR 924 +#define IMG_CUSTOM_108 925 +#define IMG_CUSTOM_108_EDITOR 926 +#define IMG_CUSTOM_109 927 +#define IMG_CUSTOM_109_EDITOR 928 +#define IMG_CUSTOM_110 929 +#define IMG_CUSTOM_110_EDITOR 930 +#define IMG_CUSTOM_111 931 +#define IMG_CUSTOM_111_EDITOR 932 +#define IMG_CUSTOM_112 933 +#define IMG_CUSTOM_112_EDITOR 934 +#define IMG_CUSTOM_113 935 +#define IMG_CUSTOM_113_EDITOR 936 +#define IMG_CUSTOM_114 937 +#define IMG_CUSTOM_114_EDITOR 938 +#define IMG_CUSTOM_115 939 +#define IMG_CUSTOM_115_EDITOR 940 +#define IMG_CUSTOM_116 941 +#define IMG_CUSTOM_116_EDITOR 942 +#define IMG_CUSTOM_117 943 +#define IMG_CUSTOM_117_EDITOR 944 +#define IMG_CUSTOM_118 945 +#define IMG_CUSTOM_118_EDITOR 946 +#define IMG_CUSTOM_119 947 +#define IMG_CUSTOM_119_EDITOR 948 +#define IMG_CUSTOM_120 949 +#define IMG_CUSTOM_120_EDITOR 950 +#define IMG_CUSTOM_121 951 +#define IMG_CUSTOM_121_EDITOR 952 +#define IMG_CUSTOM_122 953 +#define IMG_CUSTOM_122_EDITOR 954 +#define IMG_CUSTOM_123 955 +#define IMG_CUSTOM_123_EDITOR 956 +#define IMG_CUSTOM_124 957 +#define IMG_CUSTOM_124_EDITOR 958 +#define IMG_CUSTOM_125 959 +#define IMG_CUSTOM_125_EDITOR 960 +#define IMG_CUSTOM_126 961 +#define IMG_CUSTOM_126_EDITOR 962 +#define IMG_CUSTOM_127 963 +#define IMG_CUSTOM_127_EDITOR 964 +#define IMG_CUSTOM_128 965 +#define IMG_CUSTOM_128_EDITOR 966 +#define IMG_CUSTOM_129 967 +#define IMG_CUSTOM_129_EDITOR 968 +#define IMG_CUSTOM_130 969 +#define IMG_CUSTOM_130_EDITOR 970 +#define IMG_CUSTOM_131 971 +#define IMG_CUSTOM_131_EDITOR 972 +#define IMG_CUSTOM_132 973 +#define IMG_CUSTOM_132_EDITOR 974 +#define IMG_CUSTOM_133 975 +#define IMG_CUSTOM_133_EDITOR 976 +#define IMG_CUSTOM_134 977 +#define IMG_CUSTOM_134_EDITOR 978 +#define IMG_CUSTOM_135 979 +#define IMG_CUSTOM_135_EDITOR 980 +#define IMG_CUSTOM_136 981 +#define IMG_CUSTOM_136_EDITOR 982 +#define IMG_CUSTOM_137 983 +#define IMG_CUSTOM_137_EDITOR 984 +#define IMG_CUSTOM_138 985 +#define IMG_CUSTOM_138_EDITOR 986 +#define IMG_CUSTOM_139 987 +#define IMG_CUSTOM_139_EDITOR 988 +#define IMG_CUSTOM_140 989 +#define IMG_CUSTOM_140_EDITOR 990 +#define IMG_CUSTOM_141 991 +#define IMG_CUSTOM_141_EDITOR 992 +#define IMG_CUSTOM_142 993 +#define IMG_CUSTOM_142_EDITOR 994 +#define IMG_CUSTOM_143 995 +#define IMG_CUSTOM_143_EDITOR 996 +#define IMG_CUSTOM_144 997 +#define IMG_CUSTOM_144_EDITOR 998 +#define IMG_CUSTOM_145 999 +#define IMG_CUSTOM_145_EDITOR 1000 +#define IMG_CUSTOM_146 1001 +#define IMG_CUSTOM_146_EDITOR 1002 +#define IMG_CUSTOM_147 1003 +#define IMG_CUSTOM_147_EDITOR 1004 +#define IMG_CUSTOM_148 1005 +#define IMG_CUSTOM_148_EDITOR 1006 +#define IMG_CUSTOM_149 1007 +#define IMG_CUSTOM_149_EDITOR 1008 +#define IMG_CUSTOM_150 1009 +#define IMG_CUSTOM_150_EDITOR 1010 +#define IMG_CUSTOM_151 1011 +#define IMG_CUSTOM_151_EDITOR 1012 +#define IMG_CUSTOM_152 1013 +#define IMG_CUSTOM_152_EDITOR 1014 +#define IMG_CUSTOM_153 1015 +#define IMG_CUSTOM_153_EDITOR 1016 +#define IMG_CUSTOM_154 1017 +#define IMG_CUSTOM_154_EDITOR 1018 +#define IMG_CUSTOM_155 1019 +#define IMG_CUSTOM_155_EDITOR 1020 +#define IMG_CUSTOM_156 1021 +#define IMG_CUSTOM_156_EDITOR 1022 +#define IMG_CUSTOM_157 1023 +#define IMG_CUSTOM_157_EDITOR 1024 +#define IMG_CUSTOM_158 1025 +#define IMG_CUSTOM_158_EDITOR 1026 +#define IMG_CUSTOM_159 1027 +#define IMG_CUSTOM_159_EDITOR 1028 +#define IMG_CUSTOM_160 1029 +#define IMG_CUSTOM_160_EDITOR 1030 +#define IMG_CUSTOM_161 1031 +#define IMG_CUSTOM_161_EDITOR 1032 +#define IMG_CUSTOM_162 1033 +#define IMG_CUSTOM_162_EDITOR 1034 +#define IMG_CUSTOM_163 1035 +#define IMG_CUSTOM_163_EDITOR 1036 +#define IMG_CUSTOM_164 1037 +#define IMG_CUSTOM_164_EDITOR 1038 +#define IMG_CUSTOM_165 1039 +#define IMG_CUSTOM_165_EDITOR 1040 +#define IMG_CUSTOM_166 1041 +#define IMG_CUSTOM_166_EDITOR 1042 +#define IMG_CUSTOM_167 1043 +#define IMG_CUSTOM_167_EDITOR 1044 +#define IMG_CUSTOM_168 1045 +#define IMG_CUSTOM_168_EDITOR 1046 +#define IMG_CUSTOM_169 1047 +#define IMG_CUSTOM_169_EDITOR 1048 +#define IMG_CUSTOM_170 1049 +#define IMG_CUSTOM_170_EDITOR 1050 +#define IMG_CUSTOM_171 1051 +#define IMG_CUSTOM_171_EDITOR 1052 +#define IMG_CUSTOM_172 1053 +#define IMG_CUSTOM_172_EDITOR 1054 +#define IMG_CUSTOM_173 1055 +#define IMG_CUSTOM_173_EDITOR 1056 +#define IMG_CUSTOM_174 1057 +#define IMG_CUSTOM_174_EDITOR 1058 +#define IMG_CUSTOM_175 1059 +#define IMG_CUSTOM_175_EDITOR 1060 +#define IMG_CUSTOM_176 1061 +#define IMG_CUSTOM_176_EDITOR 1062 +#define IMG_CUSTOM_177 1063 +#define IMG_CUSTOM_177_EDITOR 1064 +#define IMG_CUSTOM_178 1065 +#define IMG_CUSTOM_178_EDITOR 1066 +#define IMG_CUSTOM_179 1067 +#define IMG_CUSTOM_179_EDITOR 1068 +#define IMG_CUSTOM_180 1069 +#define IMG_CUSTOM_180_EDITOR 1070 +#define IMG_CUSTOM_181 1071 +#define IMG_CUSTOM_181_EDITOR 1072 +#define IMG_CUSTOM_182 1073 +#define IMG_CUSTOM_182_EDITOR 1074 +#define IMG_CUSTOM_183 1075 +#define IMG_CUSTOM_183_EDITOR 1076 +#define IMG_CUSTOM_184 1077 +#define IMG_CUSTOM_184_EDITOR 1078 +#define IMG_CUSTOM_185 1079 +#define IMG_CUSTOM_185_EDITOR 1080 +#define IMG_CUSTOM_186 1081 +#define IMG_CUSTOM_186_EDITOR 1082 +#define IMG_CUSTOM_187 1083 +#define IMG_CUSTOM_187_EDITOR 1084 +#define IMG_CUSTOM_188 1085 +#define IMG_CUSTOM_188_EDITOR 1086 +#define IMG_CUSTOM_189 1087 +#define IMG_CUSTOM_189_EDITOR 1088 +#define IMG_CUSTOM_190 1089 +#define IMG_CUSTOM_190_EDITOR 1090 +#define IMG_CUSTOM_191 1091 +#define IMG_CUSTOM_191_EDITOR 1092 +#define IMG_CUSTOM_192 1093 +#define IMG_CUSTOM_192_EDITOR 1094 +#define IMG_CUSTOM_193 1095 +#define IMG_CUSTOM_193_EDITOR 1096 +#define IMG_CUSTOM_194 1097 +#define IMG_CUSTOM_194_EDITOR 1098 +#define IMG_CUSTOM_195 1099 +#define IMG_CUSTOM_195_EDITOR 1100 +#define IMG_CUSTOM_196 1101 +#define IMG_CUSTOM_196_EDITOR 1102 +#define IMG_CUSTOM_197 1103 +#define IMG_CUSTOM_197_EDITOR 1104 +#define IMG_CUSTOM_198 1105 +#define IMG_CUSTOM_198_EDITOR 1106 +#define IMG_CUSTOM_199 1107 +#define IMG_CUSTOM_199_EDITOR 1108 +#define IMG_CUSTOM_200 1109 +#define IMG_CUSTOM_200_EDITOR 1110 +#define IMG_CUSTOM_201 1111 +#define IMG_CUSTOM_201_EDITOR 1112 +#define IMG_CUSTOM_202 1113 +#define IMG_CUSTOM_202_EDITOR 1114 +#define IMG_CUSTOM_203 1115 +#define IMG_CUSTOM_203_EDITOR 1116 +#define IMG_CUSTOM_204 1117 +#define IMG_CUSTOM_204_EDITOR 1118 +#define IMG_CUSTOM_205 1119 +#define IMG_CUSTOM_205_EDITOR 1120 +#define IMG_CUSTOM_206 1121 +#define IMG_CUSTOM_206_EDITOR 1122 +#define IMG_CUSTOM_207 1123 +#define IMG_CUSTOM_207_EDITOR 1124 +#define IMG_CUSTOM_208 1125 +#define IMG_CUSTOM_208_EDITOR 1126 +#define IMG_CUSTOM_209 1127 +#define IMG_CUSTOM_209_EDITOR 1128 +#define IMG_CUSTOM_210 1129 +#define IMG_CUSTOM_210_EDITOR 1130 +#define IMG_CUSTOM_211 1131 +#define IMG_CUSTOM_211_EDITOR 1132 +#define IMG_CUSTOM_212 1133 +#define IMG_CUSTOM_212_EDITOR 1134 +#define IMG_CUSTOM_213 1135 +#define IMG_CUSTOM_213_EDITOR 1136 +#define IMG_CUSTOM_214 1137 +#define IMG_CUSTOM_214_EDITOR 1138 +#define IMG_CUSTOM_215 1139 +#define IMG_CUSTOM_215_EDITOR 1140 +#define IMG_CUSTOM_216 1141 +#define IMG_CUSTOM_216_EDITOR 1142 +#define IMG_CUSTOM_217 1143 +#define IMG_CUSTOM_217_EDITOR 1144 +#define IMG_CUSTOM_218 1145 +#define IMG_CUSTOM_218_EDITOR 1146 +#define IMG_CUSTOM_219 1147 +#define IMG_CUSTOM_219_EDITOR 1148 +#define IMG_CUSTOM_220 1149 +#define IMG_CUSTOM_220_EDITOR 1150 +#define IMG_CUSTOM_221 1151 +#define IMG_CUSTOM_221_EDITOR 1152 +#define IMG_CUSTOM_222 1153 +#define IMG_CUSTOM_222_EDITOR 1154 +#define IMG_CUSTOM_223 1155 +#define IMG_CUSTOM_223_EDITOR 1156 +#define IMG_CUSTOM_224 1157 +#define IMG_CUSTOM_224_EDITOR 1158 +#define IMG_CUSTOM_225 1159 +#define IMG_CUSTOM_225_EDITOR 1160 +#define IMG_CUSTOM_226 1161 +#define IMG_CUSTOM_226_EDITOR 1162 +#define IMG_CUSTOM_227 1163 +#define IMG_CUSTOM_227_EDITOR 1164 +#define IMG_CUSTOM_228 1165 +#define IMG_CUSTOM_228_EDITOR 1166 +#define IMG_CUSTOM_229 1167 +#define IMG_CUSTOM_229_EDITOR 1168 +#define IMG_CUSTOM_230 1169 +#define IMG_CUSTOM_230_EDITOR 1170 +#define IMG_CUSTOM_231 1171 +#define IMG_CUSTOM_231_EDITOR 1172 +#define IMG_CUSTOM_232 1173 +#define IMG_CUSTOM_232_EDITOR 1174 +#define IMG_CUSTOM_233 1175 +#define IMG_CUSTOM_233_EDITOR 1176 +#define IMG_CUSTOM_234 1177 +#define IMG_CUSTOM_234_EDITOR 1178 +#define IMG_CUSTOM_235 1179 +#define IMG_CUSTOM_235_EDITOR 1180 +#define IMG_CUSTOM_236 1181 +#define IMG_CUSTOM_236_EDITOR 1182 +#define IMG_CUSTOM_237 1183 +#define IMG_CUSTOM_237_EDITOR 1184 +#define IMG_CUSTOM_238 1185 +#define IMG_CUSTOM_238_EDITOR 1186 +#define IMG_CUSTOM_239 1187 +#define IMG_CUSTOM_239_EDITOR 1188 +#define IMG_CUSTOM_240 1189 +#define IMG_CUSTOM_240_EDITOR 1190 +#define IMG_CUSTOM_241 1191 +#define IMG_CUSTOM_241_EDITOR 1192 +#define IMG_CUSTOM_242 1193 +#define IMG_CUSTOM_242_EDITOR 1194 +#define IMG_CUSTOM_243 1195 +#define IMG_CUSTOM_243_EDITOR 1196 +#define IMG_CUSTOM_244 1197 +#define IMG_CUSTOM_244_EDITOR 1198 +#define IMG_CUSTOM_245 1199 +#define IMG_CUSTOM_245_EDITOR 1200 +#define IMG_CUSTOM_246 1201 +#define IMG_CUSTOM_246_EDITOR 1202 +#define IMG_CUSTOM_247 1203 +#define IMG_CUSTOM_247_EDITOR 1204 +#define IMG_CUSTOM_248 1205 +#define IMG_CUSTOM_248_EDITOR 1206 +#define IMG_CUSTOM_249 1207 +#define IMG_CUSTOM_249_EDITOR 1208 +#define IMG_CUSTOM_250 1209 +#define IMG_CUSTOM_250_EDITOR 1210 +#define IMG_CUSTOM_251 1211 +#define IMG_CUSTOM_251_EDITOR 1212 +#define IMG_CUSTOM_252 1213 +#define IMG_CUSTOM_252_EDITOR 1214 +#define IMG_CUSTOM_253 1215 +#define IMG_CUSTOM_253_EDITOR 1216 +#define IMG_CUSTOM_254 1217 +#define IMG_CUSTOM_254_EDITOR 1218 +#define IMG_CUSTOM_255 1219 +#define IMG_CUSTOM_255_EDITOR 1220 +#define IMG_CUSTOM_256 1221 +#define IMG_CUSTOM_256_EDITOR 1222 +#define IMG_GROUP_1 1223 +#define IMG_GROUP_1_EDITOR 1224 +#define IMG_GROUP_2 1225 +#define IMG_GROUP_2_EDITOR 1226 +#define IMG_GROUP_3 1227 +#define IMG_GROUP_3_EDITOR 1228 +#define IMG_GROUP_4 1229 +#define IMG_GROUP_4_EDITOR 1230 +#define IMG_GROUP_5 1231 +#define IMG_GROUP_5_EDITOR 1232 +#define IMG_GROUP_6 1233 +#define IMG_GROUP_6_EDITOR 1234 +#define IMG_GROUP_7 1235 +#define IMG_GROUP_7_EDITOR 1236 +#define IMG_GROUP_8 1237 +#define IMG_GROUP_8_EDITOR 1238 +#define IMG_GROUP_9 1239 +#define IMG_GROUP_9_EDITOR 1240 +#define IMG_GROUP_10 1241 +#define IMG_GROUP_10_EDITOR 1242 +#define IMG_GROUP_11 1243 +#define IMG_GROUP_11_EDITOR 1244 +#define IMG_GROUP_12 1245 +#define IMG_GROUP_12_EDITOR 1246 +#define IMG_GROUP_13 1247 +#define IMG_GROUP_13_EDITOR 1248 +#define IMG_GROUP_14 1249 +#define IMG_GROUP_14_EDITOR 1250 +#define IMG_GROUP_15 1251 +#define IMG_GROUP_15_EDITOR 1252 +#define IMG_GROUP_16 1253 +#define IMG_GROUP_16_EDITOR 1254 +#define IMG_GROUP_17 1255 +#define IMG_GROUP_17_EDITOR 1256 +#define IMG_GROUP_18 1257 +#define IMG_GROUP_18_EDITOR 1258 +#define IMG_GROUP_19 1259 +#define IMG_GROUP_19_EDITOR 1260 +#define IMG_GROUP_20 1261 +#define IMG_GROUP_20_EDITOR 1262 +#define IMG_GROUP_21 1263 +#define IMG_GROUP_21_EDITOR 1264 +#define IMG_GROUP_22 1265 +#define IMG_GROUP_22_EDITOR 1266 +#define IMG_GROUP_23 1267 +#define IMG_GROUP_23_EDITOR 1268 +#define IMG_GROUP_24 1269 +#define IMG_GROUP_24_EDITOR 1270 +#define IMG_GROUP_25 1271 +#define IMG_GROUP_25_EDITOR 1272 +#define IMG_GROUP_26 1273 +#define IMG_GROUP_26_EDITOR 1274 +#define IMG_GROUP_27 1275 +#define IMG_GROUP_27_EDITOR 1276 +#define IMG_GROUP_28 1277 +#define IMG_GROUP_28_EDITOR 1278 +#define IMG_GROUP_29 1279 +#define IMG_GROUP_29_EDITOR 1280 +#define IMG_GROUP_30 1281 +#define IMG_GROUP_30_EDITOR 1282 +#define IMG_GROUP_31 1283 +#define IMG_GROUP_31_EDITOR 1284 +#define IMG_GROUP_32 1285 +#define IMG_GROUP_32_EDITOR 1286 +#define IMG_TOON_1 1287 +#define IMG_TOON_2 1288 +#define IMG_TOON_3 1289 +#define IMG_TOON_4 1290 +#define IMG_TOON_5 1291 +#define IMG_TOON_6 1292 +#define IMG_TOON_7 1293 +#define IMG_TOON_8 1294 +#define IMG_TOON_9 1295 +#define IMG_TOON_10 1296 +#define IMG_TOON_11 1297 +#define IMG_TOON_12 1298 +#define IMG_TOON_13 1299 +#define IMG_TOON_14 1300 +#define IMG_TOON_15 1301 +#define IMG_TOON_16 1302 +#define IMG_TOON_17 1303 +#define IMG_TOON_18 1304 +#define IMG_TOON_19 1305 +#define IMG_TOON_20 1306 +#define IMG_MENU_CALIBRATE_RED 1307 +#define IMG_MENU_CALIBRATE_BLUE 1308 +#define IMG_MENU_CALIBRATE_YELLOW 1309 +#define IMG_MENU_BUTTON 1310 +#define IMG_MENU_BUTTON_ACTIVE 1311 +#define IMG_MENU_BUTTON_LEFT 1312 +#define IMG_MENU_BUTTON_RIGHT 1313 +#define IMG_MENU_BUTTON_UP 1314 +#define IMG_MENU_BUTTON_DOWN 1315 +#define IMG_MENU_BUTTON_LEFT_ACTIVE 1316 +#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1317 +#define IMG_MENU_BUTTON_UP_ACTIVE 1318 +#define IMG_MENU_BUTTON_DOWN_ACTIVE 1319 +#define IMG_MENU_SCROLLBAR 1320 +#define IMG_MENU_SCROLLBAR_ACTIVE 1321 +#define IMG_FONT_INITIAL_1 1322 +#define IMG_FONT_INITIAL_2 1323 +#define IMG_FONT_INITIAL_3 1324 +#define IMG_FONT_INITIAL_4 1325 +#define IMG_FONT_TITLE_1 1326 +#define IMG_FONT_TITLE_1_LEVELS 1327 +#define IMG_FONT_TITLE_2 1328 +#define IMG_FONT_MENU_1 1329 +#define IMG_FONT_MENU_2 1330 +#define IMG_FONT_TEXT_1 1331 +#define IMG_FONT_TEXT_1_LEVELS 1332 +#define IMG_FONT_TEXT_1_PREVIEW 1333 +#define IMG_FONT_TEXT_1_SCORES 1334 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1335 +#define IMG_FONT_TEXT_2 1336 +#define IMG_FONT_TEXT_2_LEVELS 1337 +#define IMG_FONT_TEXT_2_PREVIEW 1338 +#define IMG_FONT_TEXT_2_SCORES 1339 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1340 +#define IMG_FONT_TEXT_3 1341 +#define IMG_FONT_TEXT_3_LEVELS 1342 +#define IMG_FONT_TEXT_3_PREVIEW 1343 +#define IMG_FONT_TEXT_3_SCORES 1344 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1345 +#define IMG_FONT_TEXT_4 1346 +#define IMG_FONT_TEXT_4_LEVELS 1347 +#define IMG_FONT_TEXT_4_SCORES 1348 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1349 +#define IMG_FONT_ENVELOPE_1 1350 +#define IMG_FONT_ENVELOPE_2 1351 +#define IMG_FONT_ENVELOPE_3 1352 +#define IMG_FONT_ENVELOPE_4 1353 +#define IMG_FONT_INPUT_1 1354 +#define IMG_FONT_INPUT_1_MAIN 1355 +#define IMG_FONT_INPUT_1_ACTIVE 1356 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1357 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1358 +#define IMG_FONT_INPUT_2 1359 +#define IMG_FONT_INPUT_2_ACTIVE 1360 +#define IMG_FONT_OPTION_OFF 1361 +#define IMG_FONT_OPTION_ON 1362 +#define IMG_FONT_VALUE_1 1363 +#define IMG_FONT_VALUE_2 1364 +#define IMG_FONT_VALUE_OLD 1365 +#define IMG_FONT_LEVEL_NUMBER 1366 +#define IMG_FONT_TAPE_RECORDER 1367 +#define IMG_FONT_GAME_INFO 1368 +#define IMG_GLOBAL_BORDER 1369 +#define IMG_GLOBAL_DOOR 1370 +#define IMG_EDITOR_ELEMENT_BORDER 1371 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1372 +#define IMG_BACKGROUND_ENVELOPE_1 1373 +#define IMG_BACKGROUND_ENVELOPE_2 1374 +#define IMG_BACKGROUND_ENVELOPE_3 1375 +#define IMG_BACKGROUND_ENVELOPE_4 1376 +#define IMG_BACKGROUND 1377 +#define IMG_BACKGROUND_MAIN 1378 +#define IMG_BACKGROUND_LEVELS 1379 +#define IMG_BACKGROUND_SCORES 1380 +#define IMG_BACKGROUND_EDITOR 1381 +#define IMG_BACKGROUND_INFO 1382 +#define IMG_BACKGROUND_SETUP 1383 +#define IMG_BACKGROUND_DOOR 1384 -#define NUM_IMAGE_FILES 1389 +#define NUM_IMAGE_FILES 1385 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index 6993736d..cf9e54d8 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2004-03-20 03:15]" +#define COMPILE_DATE_STRING "[2004-03-20 23:14]" diff --git a/src/editor.c b/src/editor.c index da310123..56447e6c 100644 --- a/src/editor.c +++ b/src/editor.c @@ -243,12 +243,13 @@ #define ED_RADIOBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 44) #define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 66) -/* some positions in the editor control window */ +/* values for some special graphic buttons */ #define ED_BUTTON_ELEM_XPOS 6 #define ED_BUTTON_ELEM_YPOS 30 #define ED_BUTTON_ELEM_XSIZE 22 #define ED_BUTTON_ELEM_YSIZE 22 + /* some values for text input, selectbox and counter gadgets */ #define ED_BUTTON_COUNT_YPOS 60 #define ED_BUTTON_COUNT_XSIZE 20 @@ -493,9 +494,11 @@ #define GADGET_ID_PREV_CHANGE_PAGE (GADGET_ID_GRAPHICBUTTON_FIRST + 0) #define GADGET_ID_NEXT_CHANGE_PAGE (GADGET_ID_GRAPHICBUTTON_FIRST + 1) +#define GADGET_ID_COPY_CHANGE_PAGE (GADGET_ID_GRAPHICBUTTON_FIRST + 2) +#define GADGET_ID_PASTE_CHANGE_PAGE (GADGET_ID_GRAPHICBUTTON_FIRST + 3) /* gadgets for scrolling of drawing area */ -#define GADGET_ID_SCROLLING_FIRST (GADGET_ID_GRAPHICBUTTON_FIRST + 2) +#define GADGET_ID_SCROLLING_FIRST (GADGET_ID_GRAPHICBUTTON_FIRST + 4) #define GADGET_ID_SCROLL_UP (GADGET_ID_SCROLLING_FIRST + 0) #define GADGET_ID_SCROLL_DOWN (GADGET_ID_SCROLLING_FIRST + 1) @@ -704,11 +707,13 @@ /* values for graphicbutton gadgets */ #define ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE 0 #define ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE 1 +#define ED_GRAPHICBUTTON_ID_COPY_CHANGE_PAGE 2 +#define ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE 3 -#define ED_NUM_GRAPHICBUTTONS 2 +#define ED_NUM_GRAPHICBUTTONS 4 -#define ED_GRAPHICBUTTON_ID_CHANGE_FIRST ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE -#define ED_GRAPHICBUTTON_ID_CHANGE_LAST ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE +#define ED_GRAPHICBUTTON_ID_CHANGE_FIRST ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE +#define ED_GRAPHICBUTTON_ID_CHANGE_LAST ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE /* values for checkbutton gadgets */ #define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0 @@ -880,7 +885,7 @@ static struct { '\0', "copy settings from other element" }, { '\0', "copy settings to other element" }, - { '\0', "exchange settings with other element" }, + { '\0', "exchange element with other element" }, { '\0', "copy settings from this element" }, { '\0', "paste settings to this element" }, @@ -1783,6 +1788,20 @@ static struct GADGET_ID_NEXT_CHANGE_PAGE, GADGET_ID_SELECT_CHANGE_PAGE, NULL, "change page", "select next change page" }, + { + ED_BUTTON_PLUS_XPOS, ED_BUTTON_COUNT_YPOS, + -1, ED_SETTINGS_YPOS(14), + ED_BUTTON_COUNT_XSIZE, ED_BUTTON_COUNT_YSIZE, + GADGET_ID_NEXT_CHANGE_PAGE, GADGET_ID_SELECT_CHANGE_PAGE, + NULL, NULL, "copy settings from this change page" + }, + { + ED_BUTTON_PLUS_XPOS, ED_BUTTON_COUNT_YPOS, + -1, ED_SETTINGS_YPOS(14), + ED_BUTTON_COUNT_XSIZE, ED_BUTTON_COUNT_YSIZE, + GADGET_ID_NEXT_CHANGE_PAGE, GADGET_ID_SELECT_CHANGE_PAGE, + NULL, NULL, "paste settings to this change page" + }, }; static struct diff --git a/src/game.c b/src/game.c index ce08a484..917fcbb2 100644 --- a/src/game.c +++ b/src/game.c @@ -2616,7 +2616,7 @@ void RelocatePlayer(int x, int y, int element_raw) int element = (element_raw == EL_SP_MURPHY ? EL_PLAYER_1 : element_raw); struct PlayerInfo *player = &stored_player[element - EL_PLAYER_1]; boolean ffwd_delay = (tape.playing && tape.fast_forward); - boolean no_delay = (tape.index_search); + boolean no_delay = (tape.warp_forward); int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); int wait_delay_value = (no_delay ? 0 : frame_delay_value); int old_jx, old_jy; @@ -7766,7 +7766,7 @@ void GameActions() action_delay_value = (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay); - if (tape.playing && tape.index_search && !tape.pausing) + if (tape.playing && tape.warp_forward && !tape.pausing) action_delay_value = 0; /* ---------- main game synchronization point ---------- */ @@ -11138,21 +11138,15 @@ void RequestQuitGame(boolean ask_if_really_quit) { #if 1 - if (tape.playing && tape.index_search) - { - SetDrawDeactivationMask(REDRAW_NONE); - audio.sound_deactivated = FALSE; - } + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); #endif OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); #if 1 - if (tape.playing && tape.index_search) - { - SetDrawDeactivationMask(REDRAW_FIELD); - audio.sound_deactivated = TRUE; - } + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOn(); #endif } diff --git a/src/libgame/system.h b/src/libgame/system.h index f39eb1b1..7f26f635 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -275,7 +275,11 @@ PAGEX3: buffer for animations */ -#define DOOR_GFX_PAGESIZE (gfx.dxsize) +/* these values are hard-coded to be able to use them in initialization */ +#define DOOR_GFX_PAGE_WIDTH 100 /* should be set to "gfx.dxsize" */ +#define DOOR_GFX_PAGE_HEIGHT 280 /* should be set to "gfx.dysize" */ + +#define DOOR_GFX_PAGESIZE (DOOR_GFX_PAGE_WIDTH) #define DOOR_GFX_PAGEX1 (0 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEX2 (1 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEX3 (2 * DOOR_GFX_PAGESIZE) @@ -285,7 +289,7 @@ #define DOOR_GFX_PAGEX7 (6 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEX8 (7 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEY1 (0) -#define DOOR_GFX_PAGEY2 (gfx.dysize) +#define DOOR_GFX_PAGEY2 (DOOR_GFX_PAGE_HEIGHT) /* macros for version handling */ diff --git a/src/main.h b/src/main.h index c5939594..e05dd9db 100644 --- a/src/main.h +++ b/src/main.h @@ -1473,7 +1473,8 @@ struct TapeInfo boolean pause_before_death; boolean recording, playing, pausing; boolean fast_forward; - boolean index_search; + boolean warp_forward; + boolean deactivate_display; boolean auto_play; boolean auto_play_level_solved; boolean quick_resume; diff --git a/src/tape.c b/src/tape.c index 642ce5c3..7f4545b5 100644 --- a/src/tape.c +++ b/src/tape.c @@ -22,21 +22,21 @@ #include "cartoons.h" /* tape button identifiers */ -#define TAPE_CTRL_ID_EJECT 0 -#define TAPE_CTRL_ID_INDEX 1 -#define TAPE_CTRL_ID_STOP 2 -#define TAPE_CTRL_ID_PAUSE 3 -#define TAPE_CTRL_ID_RECORD 4 -#define TAPE_CTRL_ID_PLAY 5 +#define TAPE_CTRL_ID_EJECT 0 +#define TAPE_CTRL_ID_EXTRA 1 +#define TAPE_CTRL_ID_STOP 2 +#define TAPE_CTRL_ID_PAUSE 3 +#define TAPE_CTRL_ID_RECORD 4 +#define TAPE_CTRL_ID_PLAY 5 -#define NUM_TAPE_BUTTONS 6 +#define NUM_TAPE_BUTTONS 6 /* values for tape handling */ #define TAPE_PAUSE_SECONDS_BEFORE_DEATH 5 /* forward declaration for internal use */ static void HandleTapeButtons(struct GadgetInfo *); -static void TapeStopIndexSearch(); +static void TapeStopWarpForward(); static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; @@ -46,80 +46,140 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; /* ========================================================================= */ /* some positions in the video tape control window */ -#define VIDEO_DATE_LABEL_XPOS (VIDEO_DISPLAY1_XPOS) -#define VIDEO_DATE_LABEL_YPOS (VIDEO_DISPLAY1_YPOS) -#define VIDEO_DATE_LABEL_XSIZE (VIDEO_DISPLAY_XSIZE) -#define VIDEO_DATE_LABEL_YSIZE (VIDEO_DISPLAY_YSIZE) -#define VIDEO_DATE_XPOS (VIDEO_DISPLAY1_XPOS + 2) -#define VIDEO_DATE_YPOS (VIDEO_DISPLAY1_YPOS + 14) -#define VIDEO_DATE_XSIZE (VIDEO_DISPLAY_XSIZE) -#define VIDEO_DATE_YSIZE 16 -#define VIDEO_REC_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) -#define VIDEO_REC_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_REC_LABEL_XSIZE 20 -#define VIDEO_REC_LABEL_YSIZE 12 -#define VIDEO_REC_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 20) -#define VIDEO_REC_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_REC_SYMBOL_XSIZE 16 -#define VIDEO_REC_SYMBOL_YSIZE 16 -#define VIDEO_PLAY_LABEL_XPOS (VIDEO_DISPLAY2_XPOS + 65) -#define VIDEO_PLAY_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PLAY_LABEL_XSIZE 22 -#define VIDEO_PLAY_LABEL_YSIZE 12 -#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 52) -#define VIDEO_PLAY_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PLAY_SYMBOL_XSIZE 11 -#define VIDEO_PLAY_SYMBOL_YSIZE 13 -#define VIDEO_PAUSE_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) -#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS + 20) -#define VIDEO_PAUSE_LABEL_XSIZE 35 -#define VIDEO_PAUSE_LABEL_YSIZE 8 -#define VIDEO_PAUSE_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 35) -#define VIDEO_PAUSE_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PAUSE_SYMBOL_XSIZE 17 -#define VIDEO_PAUSE_SYMBOL_YSIZE 13 -#define VIDEO_TIME_XPOS (VIDEO_DISPLAY2_XPOS + 39) -#define VIDEO_TIME_YPOS (VIDEO_DISPLAY2_YPOS + 14) -#define VIDEO_TIME_XSIZE 50 -#define VIDEO_TIME_YSIZE 16 - -/* special */ -#define VIDEO_PBEND_LABEL_XPOS 5 -#define VIDEO_PBEND_LABEL_YPOS 220 -#define VIDEO_PBEND_LABEL_XSIZE 35 -#define VIDEO_PBEND_LABEL_YSIZE 30 - -#define VIDEO_STATE_OFF (VIDEO_STATE_PLAY_OFF | \ - VIDEO_STATE_REC_OFF | \ - VIDEO_STATE_PAUSE_OFF | \ - VIDEO_STATE_FFWD_OFF | \ - VIDEO_STATE_PBEND_OFF | \ - VIDEO_STATE_DATE_OFF | \ - VIDEO_STATE_TIME_OFF) -#define VIDEO_PRESS_OFF (VIDEO_PRESS_PLAY_OFF | \ - VIDEO_PRESS_REC_OFF | \ - VIDEO_PRESS_PAUSE_OFF | \ - VIDEO_PRESS_STOP_OFF | \ - VIDEO_PRESS_EJECT_OFF) -#define VIDEO_ALL_OFF (VIDEO_STATE_OFF | VIDEO_PRESS_OFF) - -#define VIDEO_STATE_ON (VIDEO_STATE_PLAY_ON | \ - VIDEO_STATE_REC_ON | \ - VIDEO_STATE_PAUSE_ON | \ - VIDEO_STATE_FFWD_ON | \ - VIDEO_STATE_PBEND_ON | \ - VIDEO_STATE_DATE_ON | \ - VIDEO_STATE_TIME_ON) -#define VIDEO_PRESS_ON (VIDEO_PRESS_PLAY_ON | \ - VIDEO_PRESS_REC_ON | \ - VIDEO_PRESS_PAUSE_ON | \ - VIDEO_PRESS_STOP_ON | \ - VIDEO_PRESS_EJECT_ON) -#define VIDEO_ALL_ON (VIDEO_STATE_ON | VIDEO_PRESS_ON) - -#define VIDEO_STATE (VIDEO_STATE_ON | VIDEO_STATE_OFF) -#define VIDEO_PRESS (VIDEO_PRESS_ON | VIDEO_PRESS_OFF) -#define VIDEO_ALL (VIDEO_ALL_ON | VIDEO_ALL_OFF) +#define VIDEO_DATE_LABEL_XPOS (VIDEO_DISPLAY1_XPOS) +#define VIDEO_DATE_LABEL_YPOS (VIDEO_DISPLAY1_YPOS) +#define VIDEO_DATE_LABEL_XSIZE (VIDEO_DISPLAY_XSIZE) +#define VIDEO_DATE_LABEL_YSIZE (VIDEO_DISPLAY_YSIZE) +#define VIDEO_DATE_XPOS (VIDEO_DISPLAY1_XPOS + 2) +#define VIDEO_DATE_YPOS (VIDEO_DISPLAY1_YPOS + 14) +#define VIDEO_DATE_XSIZE (VIDEO_DISPLAY_XSIZE) +#define VIDEO_DATE_YSIZE 16 +#define VIDEO_REC_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) +#define VIDEO_REC_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) +#define VIDEO_REC_LABEL_XSIZE 20 +#define VIDEO_REC_LABEL_YSIZE 12 +#define VIDEO_REC_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 20) +#define VIDEO_REC_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) +#define VIDEO_REC_SYMBOL_XSIZE 16 +#define VIDEO_REC_SYMBOL_YSIZE 16 +#define VIDEO_PLAY_LABEL_XPOS (VIDEO_DISPLAY2_XPOS + 65) +#define VIDEO_PLAY_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) +#define VIDEO_PLAY_LABEL_XSIZE 22 +#define VIDEO_PLAY_LABEL_YSIZE 12 +#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 52) +#define VIDEO_PLAY_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) +#define VIDEO_PLAY_SYMBOL_XSIZE 11 +#define VIDEO_PLAY_SYMBOL_YSIZE 13 +#define VIDEO_PAUSE_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) +#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS + 20) +#define VIDEO_PAUSE_LABEL_XSIZE 35 +#define VIDEO_PAUSE_LABEL_YSIZE 8 +#define VIDEO_PAUSE_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 35) +#define VIDEO_PAUSE_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) +#define VIDEO_PAUSE_SYMBOL_XSIZE 17 +#define VIDEO_PAUSE_SYMBOL_YSIZE 13 +#define VIDEO_TIME_XPOS (VIDEO_DISPLAY2_XPOS + 39) +#define VIDEO_TIME_YPOS (VIDEO_DISPLAY2_YPOS + 14) +#define VIDEO_TIME_XSIZE 50 +#define VIDEO_TIME_YSIZE 16 + +/* some default values for tape labels and symbols */ +#define VIDEO_LABEL_XPOS 5 +#define VIDEO_LABEL_YPOS 42 +#define VIDEO_LABEL_XSIZE 40 +#define VIDEO_LABEL_YSIZE 28 +#define VIDEO_SYMBOL_XPOS 39 +#define VIDEO_SYMBOL_YPOS 42 +#define VIDEO_SYMBOL_XSIZE 56 +#define VIDEO_SYMBOL_YSIZE 13 + +/* values for certain tape labels and symbols */ +#define VIDEO_FFWD_LABEL_XPOS VIDEO_LABEL_XPOS +#define VIDEO_FFWD_LABEL_YPOS 193 +#define VIDEO_FFWD_LABEL_XSIZE VIDEO_LABEL_XSIZE +#define VIDEO_FFWD_LABEL_YSIZE VIDEO_LABEL_YSIZE +#define VIDEO_FFWD_SYMBOL_XPOS VIDEO_SYMBOL_XPOS +#define VIDEO_FFWD_SYMBOL_YPOS 126 +#define VIDEO_FFWD_SYMBOL_XSIZE 27 +#define VIDEO_FFWD_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE + +#define VIDEO_PBEND_LABEL_XPOS VIDEO_LABEL_XPOS +#define VIDEO_PBEND_LABEL_YPOS 221 +#define VIDEO_PBEND_LABEL_XSIZE VIDEO_LABEL_XSIZE +#define VIDEO_PBEND_LABEL_YSIZE VIDEO_LABEL_YSIZE +#define VIDEO_PBEND_SYMBOL_XPOS VIDEO_SYMBOL_XPOS +#define VIDEO_PBEND_SYMBOL_YPOS 126 +#define VIDEO_PBEND_SYMBOL_XSIZE 27 +#define VIDEO_PBEND_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE + +#define VIDEO_WARP_LABEL_XPOS VIDEO_LABEL_XPOS +#define VIDEO_WARP_LABEL_YPOS 165 +#define VIDEO_WARP_LABEL_XSIZE VIDEO_LABEL_XSIZE +#define VIDEO_WARP_LABEL_YSIZE VIDEO_LABEL_YSIZE +#define VIDEO_WARP_SYMBOL_XPOS VIDEO_SYMBOL_XPOS +#define VIDEO_WARP_SYMBOL_YPOS 152 +#define VIDEO_WARP_SYMBOL_XSIZE 27 +#define VIDEO_WARP_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE +#define VIDEO_WARP2_SYMBOL_XPOS VIDEO_SYMBOL_XPOS +#define VIDEO_WARP2_SYMBOL_YPOS 139 +#define VIDEO_WARP2_SYMBOL_XSIZE 27 +#define VIDEO_WARP2_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE + +#define VIDEO_1STEP_SYMBOL_XPOS (VIDEO_SYMBOL_XPOS + 18) +#define VIDEO_1STEP_SYMBOL_YPOS 113 +#define VIDEO_1STEP_SYMBOL_XSIZE (VIDEO_SYMBOL_XSIZE - 18) +#define VIDEO_1STEP_SYMBOL_YSIZE VIDEO_SYMBOL_YSIZE + +#define PG_X3(x) (DOOR_GFX_PAGEX3 + (x)) +#define PG_X4(x) (DOOR_GFX_PAGEX4 + (x)) +#define PG_X5(x) (DOOR_GFX_PAGEX5 + (x)) +#define PG_X6(x) (DOOR_GFX_PAGEX6 + (x)) + +#define PG_Y1(y) (DOOR_GFX_PAGEY1 + (y)) +#define PG_Y2(y) (DOOR_GFX_PAGEY2 + (y)) + +#define VIDEO_INFO_OFF (VIDEO_STATE_DATE_OFF | \ + VIDEO_STATE_TIME_OFF) +#define VIDEO_STATE_OFF (VIDEO_STATE_PLAY_OFF | \ + VIDEO_STATE_REC_OFF | \ + VIDEO_STATE_PAUSE_OFF | \ + VIDEO_STATE_FFWD_OFF | \ + VIDEO_STATE_PBEND_OFF | \ + VIDEO_STATE_1STEP_OFF) +#define VIDEO_PRESS_OFF (VIDEO_PRESS_PLAY_OFF | \ + VIDEO_PRESS_REC_OFF | \ + VIDEO_PRESS_PAUSE_OFF | \ + VIDEO_PRESS_STOP_OFF | \ + VIDEO_PRESS_EJECT_OFF) +#define VIDEO_ALL_OFF (VIDEO_INFO_OFF | \ + VIDEO_STATE_OFF | \ + VIDEO_PRESS_OFF) + +#define VIDEO_INFO_ON (VIDEO_STATE_DATE_ON | \ + VIDEO_STATE_TIME_ON) +#define VIDEO_STATE_ON (VIDEO_STATE_PLAY_ON | \ + VIDEO_STATE_REC_ON | \ + VIDEO_STATE_PAUSE_ON | \ + VIDEO_STATE_FFWD_ON | \ + VIDEO_STATE_PBEND_ON | \ + VIDEO_STATE_1STEP_ON) +#define VIDEO_PRESS_ON (VIDEO_PRESS_PLAY_ON | \ + VIDEO_PRESS_REC_ON | \ + VIDEO_PRESS_PAUSE_ON | \ + VIDEO_PRESS_STOP_ON | \ + VIDEO_PRESS_EJECT_ON) +#define VIDEO_ALL_ON (VIDEO_INFO_ON | \ + VIDEO_STATE_ON | \ + VIDEO_PRESS_ON) + +#define VIDEO_INFO (VIDEO_INFO_ON | VIDEO_INFO_OFF) +#define VIDEO_STATE (VIDEO_STATE_ON | VIDEO_STATE_OFF) +#define VIDEO_PRESS (VIDEO_PRESS_ON | VIDEO_PRESS_OFF) +#define VIDEO_ALL (VIDEO_ALL_ON | VIDEO_ALL_OFF) + +#define NUM_TAPE_FUNCTIONS 10 +#define NUM_TAPE_FUNCTION_PARTS 2 +#define NUM_TAPE_FUNCTION_STATES 2 /* ========================================================================= */ @@ -128,44 +188,230 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; void DrawVideoDisplay(unsigned long state, unsigned long value) { - int i; - int part_label = 0, part_symbol = 1; - int xpos = 0, ypos = 1, xsize = 2, ysize = 3; + int i, j, k; static char *monatsname[12] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" }; - static int video_pos[5][2][4] = + static struct + { + int gd_x1, gd_y1; + int gd_x2, gd_y2; + int x, y; + int width, height; + } + video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] = { - {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS, - VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE }, - { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS, - VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }}, - - {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS, - VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE }, - { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS, - VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }}, - - {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS, - VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE }, - { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS, - VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }}, - - {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS, - VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE }, - { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS, - VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }}, - - {{ 0,0, - 0,0 }, - { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS, - VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }} + { + { + PG_X4(VIDEO_PLAY_LABEL_XPOS), PG_Y2(VIDEO_PLAY_LABEL_YPOS), + PG_X3(VIDEO_PLAY_LABEL_XPOS), PG_Y2(VIDEO_PLAY_LABEL_YPOS), + VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS, + VIDEO_PLAY_LABEL_XSIZE, VIDEO_PLAY_LABEL_YSIZE + }, + { + PG_X4(VIDEO_PLAY_SYMBOL_XPOS), PG_Y2(VIDEO_PLAY_SYMBOL_YPOS), + PG_X3(VIDEO_PLAY_SYMBOL_XPOS), PG_Y2(VIDEO_PLAY_SYMBOL_YPOS), + VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS, + VIDEO_PLAY_SYMBOL_XSIZE, VIDEO_PLAY_SYMBOL_YSIZE + } + }, + { + { + PG_X4(VIDEO_REC_LABEL_XPOS), PG_Y2(VIDEO_REC_LABEL_YPOS), + PG_X3(VIDEO_REC_LABEL_XPOS), PG_Y2(VIDEO_REC_LABEL_YPOS), + VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS, + VIDEO_REC_LABEL_XSIZE, VIDEO_REC_LABEL_YSIZE + }, + { + PG_X4(VIDEO_REC_SYMBOL_XPOS), PG_Y2(VIDEO_REC_SYMBOL_YPOS), + PG_X3(VIDEO_REC_SYMBOL_XPOS), PG_Y2(VIDEO_REC_SYMBOL_YPOS), + VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS, + VIDEO_REC_SYMBOL_XSIZE, VIDEO_REC_SYMBOL_YSIZE + } + }, + { + { + PG_X4(VIDEO_PAUSE_LABEL_XPOS), PG_Y2(VIDEO_PAUSE_LABEL_YPOS), + PG_X3(VIDEO_PAUSE_LABEL_XPOS), PG_Y2(VIDEO_PAUSE_LABEL_YPOS), + VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS, + VIDEO_PAUSE_LABEL_XSIZE, VIDEO_PAUSE_LABEL_YSIZE + }, + { + PG_X4(VIDEO_PAUSE_SYMBOL_XPOS), PG_Y2(VIDEO_PAUSE_SYMBOL_YPOS), + PG_X3(VIDEO_PAUSE_SYMBOL_XPOS), PG_Y2(VIDEO_PAUSE_SYMBOL_YPOS), + VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS, + VIDEO_PAUSE_SYMBOL_XSIZE, VIDEO_PAUSE_SYMBOL_YSIZE + } + }, + { + { + PG_X4(VIDEO_DATE_LABEL_XPOS), PG_Y2(VIDEO_DATE_LABEL_YPOS), + PG_X3(VIDEO_DATE_LABEL_XPOS), PG_Y2(VIDEO_DATE_LABEL_YPOS), + VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS, + VIDEO_DATE_LABEL_XSIZE, VIDEO_DATE_LABEL_YSIZE + }, + { + PG_X4(VIDEO_DATE_XPOS), PG_Y2(VIDEO_DATE_YPOS), + PG_X3(VIDEO_DATE_XPOS), PG_Y2(VIDEO_DATE_YPOS), + VIDEO_DATE_XPOS, VIDEO_DATE_YPOS, + VIDEO_DATE_XSIZE, VIDEO_DATE_YSIZE + } + }, + { + { + -1, -1, + -1, -1, + -1, -1, + -1, -1 + }, + { + PG_X4(VIDEO_TIME_XPOS), PG_Y2(VIDEO_TIME_YPOS), + PG_X3(VIDEO_TIME_XPOS), PG_Y2(VIDEO_TIME_YPOS), + VIDEO_TIME_XPOS, VIDEO_TIME_YPOS, + VIDEO_TIME_XSIZE, VIDEO_TIME_YSIZE + } + }, + { + { + PG_X6(VIDEO_FFWD_LABEL_XPOS), PG_Y1(VIDEO_FFWD_LABEL_YPOS), + PG_X3(VIDEO_LABEL_XPOS), PG_Y2(VIDEO_LABEL_YPOS), + VIDEO_LABEL_XPOS, VIDEO_LABEL_YPOS, + VIDEO_LABEL_XSIZE, VIDEO_LABEL_YSIZE + }, + { + PG_X6(VIDEO_FFWD_SYMBOL_XPOS), PG_Y1(VIDEO_FFWD_SYMBOL_YPOS), + PG_X3(VIDEO_FFWD_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), + VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, + VIDEO_FFWD_SYMBOL_XSIZE, VIDEO_FFWD_SYMBOL_YSIZE + } + }, + { + { + PG_X6(VIDEO_PBEND_LABEL_XPOS), PG_Y1(VIDEO_PBEND_LABEL_YPOS), + PG_X3(VIDEO_LABEL_XPOS), PG_Y2(VIDEO_LABEL_YPOS), + VIDEO_LABEL_XPOS, VIDEO_LABEL_YPOS, + VIDEO_LABEL_XSIZE, VIDEO_LABEL_YSIZE + }, + { + PG_X6(VIDEO_PBEND_SYMBOL_XPOS), PG_Y1(VIDEO_PBEND_SYMBOL_YPOS), + PG_X3(VIDEO_PBEND_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), + VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, + VIDEO_PBEND_SYMBOL_XSIZE, VIDEO_PBEND_SYMBOL_YSIZE + } + }, + { + { + PG_X6(VIDEO_WARP_LABEL_XPOS), PG_Y1(VIDEO_WARP_LABEL_YPOS), + PG_X3(VIDEO_LABEL_XPOS), PG_Y2(VIDEO_LABEL_YPOS), + VIDEO_LABEL_XPOS, VIDEO_LABEL_YPOS, + VIDEO_LABEL_XSIZE, VIDEO_LABEL_YSIZE + }, + { + PG_X6(VIDEO_WARP_SYMBOL_XPOS), PG_Y1(VIDEO_WARP_SYMBOL_YPOS), + PG_X3(VIDEO_WARP_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), + VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, + VIDEO_WARP_SYMBOL_XSIZE, VIDEO_WARP_SYMBOL_YSIZE + } + }, + { + { + -1, -1, + -1, -1, + -1, -1, + -1, -1 + }, + { + PG_X6(VIDEO_WARP2_SYMBOL_XPOS), PG_Y1(VIDEO_WARP2_SYMBOL_YPOS), + PG_X3(VIDEO_WARP2_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), + VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, + VIDEO_WARP2_SYMBOL_XSIZE, VIDEO_WARP2_SYMBOL_YSIZE + } + }, + { + { + -1, -1, + -1, -1, + -1, -1, + -1, -1 + }, + { + PG_X6(VIDEO_1STEP_SYMBOL_XPOS), PG_Y1(VIDEO_1STEP_SYMBOL_YPOS), + PG_X3(VIDEO_1STEP_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), + VIDEO_1STEP_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, + VIDEO_1STEP_SYMBOL_XSIZE, VIDEO_1STEP_SYMBOL_YSIZE + } + }, }; +#if 0 + if (state & VIDEO_STATE_FFWD_OFF) + { +#if 1 + int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; + + if (value != VIDEO_DISPLAY_SYMBOL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_LABEL_XPOS, + cy + VIDEO_LABEL_YPOS, + VIDEO_LABEL_XSIZE, + VIDEO_LABEL_YSIZE, + VX + VIDEO_LABEL_XPOS, + VY + VIDEO_LABEL_YPOS); + + cx = DOOR_GFX_PAGEX3; + cy = DOOR_GFX_PAGEY2; + + if (value != VIDEO_DISPLAY_LABEL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_FFWD_SYMBOL_XPOS, + cy + VIDEO_SYMBOL_YPOS, + VIDEO_FFWD_SYMBOL_XSIZE, + VIDEO_FFWD_SYMBOL_YSIZE, + VX + VIDEO_SYMBOL_XPOS, + VY + VIDEO_SYMBOL_YPOS); +#else + int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; + + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_PLAY_SYMBOL_XPOS - 9, + cy + VIDEO_PLAY_SYMBOL_YPOS, + VIDEO_PLAY_SYMBOL_XSIZE - 2, + VIDEO_PLAY_SYMBOL_YSIZE, + VX + VIDEO_PLAY_SYMBOL_XPOS - 9, + VY + VIDEO_PLAY_SYMBOL_YPOS); +#endif + } +#endif + +#if 0 if (state & VIDEO_STATE_PBEND_OFF) { +#if 1 + int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; + + if (value != VIDEO_DISPLAY_SYMBOL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_LABEL_XPOS, + cy + VIDEO_LABEL_YPOS, + VIDEO_LABEL_XSIZE, + VIDEO_LABEL_YSIZE, + VX + VIDEO_LABEL_XPOS, + VY + VIDEO_LABEL_YPOS); + + cx = DOOR_GFX_PAGEX3; + cy = DOOR_GFX_PAGEY2; + + if (value != VIDEO_DISPLAY_LABEL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_PBEND_SYMBOL_XPOS, + cy + VIDEO_SYMBOL_YPOS, + VIDEO_PBEND_SYMBOL_XSIZE, + VIDEO_PBEND_SYMBOL_YSIZE, + VX + VIDEO_PBEND_SYMBOL_XPOS, + VY + VIDEO_SYMBOL_YPOS); +#else int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, @@ -175,40 +421,88 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) VIDEO_PBEND_LABEL_YSIZE, VX + VIDEO_REC_LABEL_XPOS, VY + VIDEO_REC_LABEL_YPOS); +#endif } +#endif - for (i = 0; i < 10; i++) +#if 0 + if (state & VIDEO_STATE_1STEP_OFF) { - if (state & (1< STATE_ON / PRESS_OFF */ - cx = DOOR_GFX_PAGEX4; - else - cx = DOOR_GFX_PAGEX3; /* i gerade => STATE_OFF / PRESS_ON */ - - if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + video_pos[pos][part_label][xpos], - cy + video_pos[pos][part_label][ypos], - video_pos[pos][part_label][xsize], - video_pos[pos][part_label][ysize], - VX + video_pos[pos][part_label][xpos], - VY + video_pos[pos][part_label][ypos]); - if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + video_pos[pos][part_symbol][xpos], - cy + video_pos[pos][part_symbol][ypos], - video_pos[pos][part_symbol][xsize], - video_pos[pos][part_symbol][ysize], - VX + video_pos[pos][part_symbol][xpos], - VY + video_pos[pos][part_symbol][ypos]); + if (value != VIDEO_DISPLAY_LABEL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_1STEP_SYMBOL_XPOS, + cy + VIDEO_SYMBOL_YPOS, + VIDEO_1STEP_SYMBOL_XSIZE, + VIDEO_1STEP_SYMBOL_YSIZE, + VX + VIDEO_1STEP_SYMBOL_XPOS, + VY + VIDEO_SYMBOL_YPOS); + } +#endif + + for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++) /* on or off states */ + { + for (i = 0; i < NUM_TAPE_FUNCTIONS; i++) /* record, play, ... */ + { + for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++) /* label or symbol */ + { + if (state & (1 << (i * 2 + k))) + { + int gd_x, gd_y; + int skip_value = + (j == 0 ? VIDEO_DISPLAY_SYMBOL_ONLY : VIDEO_DISPLAY_LABEL_ONLY); + + if (k == 1) /* on */ + { + gd_x = video_pos[i][j].gd_x1; + gd_y = video_pos[i][j].gd_y1; + } + else /* off */ + { + gd_x = video_pos[i][j].gd_x2; + gd_y = video_pos[i][j].gd_y2; + } + + if (video_pos[i][j].x != -1 && value != skip_value) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + gd_x, gd_y, + video_pos[i][j].width, + video_pos[i][j].height, + VX + video_pos[i][j].x, + VY + video_pos[i][j].y); + } + } } } +#if 0 if (state & VIDEO_STATE_FFWD_ON) { +#if 1 + int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; + + if (value != VIDEO_DISPLAY_SYMBOL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_FFWD_LABEL_XPOS, + cy + VIDEO_FFWD_LABEL_YPOS, + VIDEO_LABEL_XSIZE, + VIDEO_LABEL_YSIZE, + VX + VIDEO_LABEL_XPOS, + VY + VIDEO_LABEL_YPOS); + + cx = DOOR_GFX_PAGEX6; + cy = DOOR_GFX_PAGEY1; + + if (value != VIDEO_DISPLAY_LABEL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_FFWD_SYMBOL_XPOS, + cy + VIDEO_FFWD_SYMBOL_YPOS, + VIDEO_FFWD_SYMBOL_XSIZE, + VIDEO_FFWD_SYMBOL_YSIZE, + VX + VIDEO_SYMBOL_XPOS, + VY + VIDEO_SYMBOL_YPOS); +#else int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2; BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, @@ -218,10 +512,37 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) VIDEO_PLAY_SYMBOL_YSIZE, VX + VIDEO_PLAY_SYMBOL_XPOS - 9, VY + VIDEO_PLAY_SYMBOL_YPOS); +#endif } +#endif +#if 0 if (state & VIDEO_STATE_PBEND_ON) { +#if 1 + int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; + + if (value != VIDEO_DISPLAY_SYMBOL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_PBEND_LABEL_XPOS, + cy + VIDEO_PBEND_LABEL_YPOS, + VIDEO_LABEL_XSIZE, + VIDEO_LABEL_YSIZE, + VX + VIDEO_LABEL_XPOS, + VY + VIDEO_LABEL_YPOS); + + cx = DOOR_GFX_PAGEX6; + cy = DOOR_GFX_PAGEY1; + + if (value != VIDEO_DISPLAY_LABEL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_PBEND_SYMBOL_XPOS, + cy + VIDEO_PBEND_SYMBOL_YPOS, + VIDEO_PBEND_SYMBOL_XSIZE, + VIDEO_PBEND_SYMBOL_YSIZE, + VX + VIDEO_SYMBOL_XPOS, + VY + VIDEO_SYMBOL_YPOS); +#else int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, @@ -231,7 +552,25 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) VIDEO_PBEND_LABEL_YSIZE, VX + VIDEO_REC_LABEL_XPOS, VY + VIDEO_REC_LABEL_YPOS); +#endif + } +#endif + +#if 0 + if (state & VIDEO_STATE_1STEP_ON) + { + int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; + + if (value != VIDEO_DISPLAY_LABEL_ONLY) + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, + cx + VIDEO_1STEP_SYMBOL_XPOS, + cy + VIDEO_1STEP_SYMBOL_YPOS, + VIDEO_1STEP_SYMBOL_XSIZE, + VIDEO_1STEP_SYMBOL_YSIZE, + VX + VIDEO_1STEP_SYMBOL_XPOS, + VY + VIDEO_SYMBOL_YPOS); } +#endif if (state & VIDEO_STATE_DATE_ON) { @@ -258,12 +597,16 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) int2str(sec, 2), FONT_TAPE_RECORDER); } +#if 1 + redraw_mask |= REDRAW_DOOR_2; +#else if (state & VIDEO_STATE_DATE) redraw_mask |= REDRAW_VIDEO_1; if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE) redraw_mask |= REDRAW_VIDEO_2; if (state & VIDEO_PRESS) redraw_mask |= REDRAW_VIDEO_3; +#endif } void DrawCompleteVideoDisplay() @@ -288,6 +631,24 @@ void DrawCompleteVideoDisplay() DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2); } +void TapeDeactivateDisplayOn() +{ + SetDrawDeactivationMask(REDRAW_FIELD); + audio.sound_deactivated = TRUE; +} + +void TapeDeactivateDisplayOff(boolean redraw_display) +{ + SetDrawDeactivationMask(REDRAW_NONE); + audio.sound_deactivated = FALSE; + + if (redraw_display) + { + RedrawPlayfield(TRUE, 0,0,0,0); + DrawGameDoorValues(); + } +} + /* ========================================================================= */ /* tape control functions */ @@ -333,7 +694,8 @@ static void TapeRewind() tape.recording = FALSE; tape.playing = FALSE; tape.fast_forward = FALSE; - tape.index_search = FALSE; + tape.warp_forward = FALSE; + tape.deactivate_display = FALSE; tape.auto_play = (global.autoplay_leveldir != NULL); tape.auto_play_level_solved = FALSE; tape.quick_resume = FALSE; @@ -355,7 +717,7 @@ void TapeStartRecording() DrawVideoDisplay(VIDEO_STATE_REC_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); - MapTapeIndexButton(); + MapTapeWarpButton(); SetDrawDeactivationMask(REDRAW_NONE); audio.sound_deactivated = FALSE; @@ -471,13 +833,18 @@ void TapeRecordAction(byte action[MAX_PLAYERS]) void TapeTogglePause(boolean toggle_manual) { - unsigned long state; + int state = 0; #if 0 if (!tape.recording && !tape.playing) return; #endif + if (tape.pause_before_death) + state |= VIDEO_STATE_PBEND_OFF; + else if (tape.fast_forward) + state |= VIDEO_STATE_FFWD_OFF; + tape.pausing = !tape.pausing; tape.fast_forward = FALSE; tape.pause_before_death = FALSE; @@ -485,15 +852,22 @@ void TapeTogglePause(boolean toggle_manual) if (tape.single_step && toggle_manual) tape.single_step = FALSE; - state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF); + state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF); if (tape.playing) - state |= VIDEO_STATE_PBEND_OFF; + state |= VIDEO_STATE_PLAY_ON; + else + state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF); DrawVideoDisplay(state, 0); - if (tape.index_search) +#if 0 + if (tape.pausing) + DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); +#endif + + if (tape.warp_forward) { - TapeStopIndexSearch(); + TapeStopWarpForward(); if (tape.quick_resume) { @@ -522,7 +896,7 @@ void TapeStartPlaying() DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); - MapTapeIndexButton(); + MapTapeWarpButton(); SetDrawDeactivationMask(REDRAW_NONE); audio.sound_deactivated = FALSE; @@ -545,8 +919,8 @@ void TapeStopPlaying() tape.playing = FALSE; tape.pausing = FALSE; - if (tape.index_search) - TapeStopIndexSearch(); + if (tape.warp_forward) + TapeStopWarpForward(); DrawVideoDisplay(VIDEO_STATE_PLAY_OFF, 0); MapTapeEjectButton(); @@ -570,16 +944,48 @@ byte *TapePlayAction() DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY); } + if (tape.warp_forward) + { + if (tape.deactivate_display) + DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + else + DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + } + if (TimePlayed > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH) { TapeTogglePause(TAPE_TOGGLE_MANUAL); return NULL; } } + else if (tape.fast_forward) + { + if ((FrameCounter / 20) % 2) + DrawVideoDisplay(VIDEO_STATE_FFWD_ON, VIDEO_DISPLAY_LABEL_ONLY); + else + DrawVideoDisplay(VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY); + + if (tape.warp_forward) + { + if (tape.deactivate_display) + DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + else + DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + } + } + else if (tape.warp_forward) + { + if ((FrameCounter / 20) % 2) + DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_LABEL_ONLY); + else + DrawVideoDisplay(VIDEO_STATE_WARP_OFF, VIDEO_DISPLAY_LABEL_ONLY); + + DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + } if (tape.counter >= tape.length) /* end of tape reached */ { - if (tape.index_search && !tape.auto_play) + if (tape.warp_forward && !tape.auto_play) TapeTogglePause(TAPE_TOGGLE_MANUAL); else TapeStop(); @@ -616,7 +1022,8 @@ void TapeStop() TapeStopRecording(); TapeStopPlaying(); - DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); + DrawVideoDisplay(VIDEO_STATE_OFF, 0); + if (tape.date && tape.length) { DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); @@ -643,26 +1050,44 @@ unsigned int GetTapeLength() return(tape_length * GAME_FRAME_DELAY / 1000); } -static void TapeStartIndexSearch() +static void TapeStartWarpForward() { - tape.index_search = TRUE; + tape.warp_forward = TRUE; + +#if 1 + if (!tape.fast_forward && !tape.pause_before_death) + { + tape.pausing = FALSE; + tape.deactivate_display = TRUE; + TapeDeactivateDisplayOn(); + } +#else if (!tape.fast_forward || tape.pause_before_death) { tape.pausing = FALSE; + tape.deactivate_display = TRUE; - SetDrawDeactivationMask(REDRAW_FIELD); - audio.sound_deactivated = TRUE; + TapeDeactivateDisplayOn(); } +#endif + + if (tape.fast_forward || tape.pause_before_death) + DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); + else + DrawVideoDisplay(VIDEO_STATE_WARP_ON, 0); } -static void TapeStopIndexSearch() +static void TapeStopWarpForward() { - tape.index_search = FALSE; + int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF); - SetDrawDeactivationMask(REDRAW_NONE); - audio.sound_deactivated = FALSE; + tape.warp_forward = FALSE; + tape.deactivate_display = FALSE; + TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); + +#if 0 #if 1 if (game_status == GAME_MODE_PLAYING) #endif @@ -670,6 +1095,16 @@ static void TapeStopIndexSearch() RedrawPlayfield(TRUE, 0,0,0,0); DrawGameDoorValues(); } +#endif + + if (tape.pause_before_death) + state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PBEND_ON; + else if (tape.fast_forward) + state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_FFWD_ON; + else + state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PLAY_ON; + + DrawVideoDisplay(state, 0); } static void TapeSingleStep() @@ -681,6 +1116,9 @@ static void TapeSingleStep() TapeTogglePause(TAPE_TOGGLE_MANUAL); tape.single_step = !tape.single_step; + + DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON : + VIDEO_STATE_1STEP_OFF), 0); } void TapeQuickSave() @@ -710,7 +1148,7 @@ void TapeQuickLoad() if (!TAPE_IS_EMPTY(tape)) { TapeStartGamePlaying(); - TapeStartIndexSearch(); + TapeStartWarpForward(); tape.quick_resume = TRUE; } @@ -827,7 +1265,7 @@ void AutoPlayTape() printf("playing tape ... "); TapeStartGamePlaying(); - TapeStartIndexSearch(); + TapeStartWarpForward(); return; } @@ -865,7 +1303,7 @@ void AutoPlayTape() #define TAPE_BUTTON_YPOS 77 #define TAPE_BUTTON_EJECT_XPOS (TAPE_BUTTON_XPOS + 0 * TAPE_BUTTON_XSIZE) -#define TAPE_BUTTON_INDEX_XPOS (TAPE_BUTTON_XPOS + 0 * TAPE_BUTTON_XSIZE) +#define TAPE_BUTTON_EXTRA_XPOS (TAPE_BUTTON_XPOS + 0 * TAPE_BUTTON_XSIZE) #define TAPE_BUTTON_STOP_XPOS (TAPE_BUTTON_XPOS + 1 * TAPE_BUTTON_XSIZE) #define TAPE_BUTTON_PAUSE_XPOS (TAPE_BUTTON_XPOS + 2 * TAPE_BUTTON_XSIZE) #define TAPE_BUTTON_RECORD_XPOS (TAPE_BUTTON_XPOS + 3 * TAPE_BUTTON_XSIZE) @@ -884,9 +1322,9 @@ static struct "eject tape" }, { - TAPE_BUTTON_INDEX_XPOS, TAPE_BUTTON_YPOS, - TAPE_CTRL_ID_INDEX, - "index mark" + TAPE_BUTTON_EXTRA_XPOS, TAPE_BUTTON_YPOS, + TAPE_CTRL_ID_EXTRA, + "extra functions" }, { TAPE_BUTTON_STOP_XPOS, TAPE_BUTTON_YPOS, @@ -928,7 +1366,7 @@ void CreateTapeButtons() gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset; gd_y = DOOR_GFX_PAGEY2 + gd_yoffset; - if (i == TAPE_CTRL_ID_INDEX) + if (i == TAPE_CTRL_ID_EXTRA) { gd_x1 = DOOR_GFX_PAGEX6 + gd_xoffset; gd_x2 = DOOR_GFX_PAGEX5 + gd_xoffset; @@ -965,14 +1403,14 @@ void FreeTapeButtons() void MapTapeEjectButton() { - UnmapGadget(tape_gadget[TAPE_CTRL_ID_INDEX]); + UnmapGadget(tape_gadget[TAPE_CTRL_ID_EXTRA]); MapGadget(tape_gadget[TAPE_CTRL_ID_EJECT]); } -void MapTapeIndexButton() +void MapTapeWarpButton() { UnmapGadget(tape_gadget[TAPE_CTRL_ID_EJECT]); - MapGadget(tape_gadget[TAPE_CTRL_ID_INDEX]); + MapGadget(tape_gadget[TAPE_CTRL_ID_EXTRA]); } void MapTapeButtons() @@ -980,11 +1418,11 @@ void MapTapeButtons() int i; for (i = 0; i < NUM_TAPE_BUTTONS; i++) - if (i != TAPE_CTRL_ID_INDEX) + if (i != TAPE_CTRL_ID_EXTRA) MapGadget(tape_gadget[i]); if (tape.recording || tape.playing) - MapTapeIndexButton(); + MapTapeWarpButton(); } void UnmapTapeButtons() @@ -1021,9 +1459,27 @@ static void HandleTapeButtons(struct GadgetInfo *gi) DrawCompleteVideoDisplay(); break; - case TAPE_CTRL_ID_INDEX: + case TAPE_CTRL_ID_EXTRA: if (tape.playing) - TapeStartIndexSearch(); + { + if (!tape.warp_forward) /* PLAY -> WARP FORWARD PLAY */ + { + TapeStartWarpForward(); + } + else /* WARP FORWARD PLAY -> PLAY */ + { + TapeStopWarpForward(); + +#if 0 + if (tape.pause_before_death) + DrawVideoDisplay(VIDEO_STATE_WARP_OFF | VIDEO_STATE_PLAY_ON, 0); + else if (tape.fast_forward) + DrawVideoDisplay(VIDEO_STATE_WARP_OFF | VIDEO_STATE_FFWD_ON, 0); + else + DrawVideoDisplay(VIDEO_STATE_WARP_OFF | VIDEO_STATE_PBEND_ON, 0); +#endif + } + } else if (tape.recording) TapeSingleStep(); break; @@ -1041,7 +1497,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi) TapeStartGameRecording(); else if (tape.pausing) { - if (tape.playing) /* PLAYING -> PAUSING -> RECORDING */ + if (tape.playing) /* PLAY -> PAUSE -> RECORD */ TapeAppendRecording(); else TapeTogglePause(TAPE_TOGGLE_MANUAL); @@ -1070,13 +1526,22 @@ static void HandleTapeButtons(struct GadgetInfo *gi) else if (!tape.pause_before_death) /* FFWD PLAY -> AUTO PAUSE */ { tape.pause_before_death = TRUE; +#if 1 + DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0); +#else DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY); +#endif } else /* AUTO PAUSE -> NORMAL PLAY */ { tape.fast_forward = FALSE; tape.pause_before_death = FALSE; + tape.warp_forward = FALSE; +#if 1 + DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0); +#else DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0); +#endif } } break; diff --git a/src/tape.h b/src/tape.h index 03cc3d24..4bddf23b 100644 --- a/src/tape.h +++ b/src/tape.h @@ -36,45 +36,54 @@ #define VIDEO_CONTROL_YSIZE VIDEO_BUTTON_YSIZE /* values for video tape control */ -#define VIDEO_STATE_PLAY_OFF (1L << 0) -#define VIDEO_STATE_PLAY_ON (1L << 1) +#define VIDEO_STATE_PLAY_OFF (1 << 0) +#define VIDEO_STATE_PLAY_ON (1 << 1) #define VIDEO_STATE_PLAY (VIDEO_STATE_PLAY_OFF | VIDEO_STATE_PLAY_ON) -#define VIDEO_STATE_REC_OFF (1L << 2) -#define VIDEO_STATE_REC_ON (1L << 3) +#define VIDEO_STATE_REC_OFF (1 << 2) +#define VIDEO_STATE_REC_ON (1 << 3) #define VIDEO_STATE_REC (VIDEO_STATE_REC_OFF | VIDEO_STATE_REC_ON) -#define VIDEO_STATE_PAUSE_OFF (1L << 4) -#define VIDEO_STATE_PAUSE_ON (1L << 5) +#define VIDEO_STATE_PAUSE_OFF (1 << 4) +#define VIDEO_STATE_PAUSE_ON (1 << 5) #define VIDEO_STATE_PAUSE (VIDEO_STATE_PAUSE_OFF | VIDEO_STATE_PAUSE_ON) -#define VIDEO_STATE_DATE_OFF (1L << 6) -#define VIDEO_STATE_DATE_ON (1L << 7) +#define VIDEO_STATE_DATE_OFF (1 << 6) +#define VIDEO_STATE_DATE_ON (1 << 7) #define VIDEO_STATE_DATE (VIDEO_STATE_DATE_OFF | VIDEO_STATE_DATE_ON) -#define VIDEO_STATE_TIME_OFF (1L << 8) -#define VIDEO_STATE_TIME_ON (1L << 9) +#define VIDEO_STATE_TIME_OFF (1 << 8) +#define VIDEO_STATE_TIME_ON (1 << 9) #define VIDEO_STATE_TIME (VIDEO_STATE_TIME_OFF | VIDEO_STATE_TIME_ON) -#define VIDEO_PRESS_PLAY_ON (1L << 10) -#define VIDEO_PRESS_PLAY_OFF (1L << 11) + +#define VIDEO_STATE_FFWD_OFF (1 << 10) +#define VIDEO_STATE_FFWD_ON (1 << 11) +#define VIDEO_STATE_FFWD (VIDEO_STATE_FFWD_OFF | VIDEO_STATE_FFWD_ON) +#define VIDEO_STATE_PBEND_OFF (1 << 12) +#define VIDEO_STATE_PBEND_ON (1 << 13) +#define VIDEO_STATE_PBEND (VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PBEND_ON) +#define VIDEO_STATE_WARP_OFF (1 << 14) +#define VIDEO_STATE_WARP_ON (1 << 15) +#define VIDEO_STATE_WARP (VIDEO_STATE_WARP_OFF | VIDEO_STATE_WARP_ON) +#define VIDEO_STATE_WARP2_OFF (1 << 16) +#define VIDEO_STATE_WARP2_ON (1 << 17) +#define VIDEO_STATE_WARP2 (VIDEO_STATE_WARP_OFF | VIDEO_STATE_WARP_ON) +#define VIDEO_STATE_1STEP_OFF (1 << 18) +#define VIDEO_STATE_1STEP_ON (1 << 19) +#define VIDEO_STATE_1STEP (VIDEO_STATE_1STEP_OFF | VIDEO_STATE_1STEP_ON) + +#define VIDEO_PRESS_PLAY_ON (1 << 20) +#define VIDEO_PRESS_PLAY_OFF (1 << 21) #define VIDEO_PRESS_PLAY (VIDEO_PRESS_PLAY_OFF | VIDEO_PRESS_PLAY_ON) -#define VIDEO_PRESS_REC_ON (1L << 12) -#define VIDEO_PRESS_REC_OFF (1L << 13) +#define VIDEO_PRESS_REC_ON (1 << 22) +#define VIDEO_PRESS_REC_OFF (1 << 23) #define VIDEO_PRESS_REC (VIDEO_PRESS_REC_OFF | VIDEO_PRESS_REC_ON) -#define VIDEO_PRESS_PAUSE_ON (1L << 14) -#define VIDEO_PRESS_PAUSE_OFF (1L << 15) +#define VIDEO_PRESS_PAUSE_ON (1 << 24) +#define VIDEO_PRESS_PAUSE_OFF (1 << 25) #define VIDEO_PRESS_PAUSE (VIDEO_PRESS_PAUSE_OFF | VIDEO_PRESS_PAUSE_ON) -#define VIDEO_PRESS_STOP_ON (1L << 16) -#define VIDEO_PRESS_STOP_OFF (1L << 17) +#define VIDEO_PRESS_STOP_ON (1 << 26) +#define VIDEO_PRESS_STOP_OFF (1 << 27) #define VIDEO_PRESS_STOP (VIDEO_PRESS_STOP_OFF | VIDEO_PRESS_STOP_ON) -#define VIDEO_PRESS_EJECT_ON (1L << 18) -#define VIDEO_PRESS_EJECT_OFF (1L << 19) +#define VIDEO_PRESS_EJECT_ON (1 << 28) +#define VIDEO_PRESS_EJECT_OFF (1 << 29) #define VIDEO_PRESS_EJECT (VIDEO_PRESS_EJECT_OFF | VIDEO_PRESS_EJECT_ON) -/* special */ -#define VIDEO_STATE_FFWD_OFF ((1L << 20) | VIDEO_STATE_PAUSE_OFF) -#define VIDEO_STATE_FFWD_ON (1L << 21) -#define VIDEO_STATE_FFWD (VIDEO_STATE_FFWD_OFF | VIDEO_STATE_FFWD_ON) -#define VIDEO_STATE_PBEND_OFF (1L << 22) -#define VIDEO_STATE_PBEND_ON (1L << 23) -#define VIDEO_STATE_PBEND (VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PBEND_ON) - /* tags to draw video display labels or symbols only */ /* (negative values to prevent misinterpretation in DrawVideoDisplay(), where the variable "value" is also used for tape length -- better fix this) */ @@ -86,6 +95,9 @@ void DrawVideoDisplay(unsigned long, unsigned long); void DrawCompleteVideoDisplay(void); +void TapeDeactivateDisplayOn(); +void TapeDeactivateDisplayOff(boolean); + void TapeStartRecording(void); void TapeHaltRecording(void); void TapeStopRecording(void); @@ -106,7 +118,7 @@ void AutoPlayTape(void); void CreateTapeButtons(); void FreeTapeButtons(); void MapTapeEjectButton(); -void MapTapeIndexButton(); +void MapTapeWarpButton(); void MapTapeButtons(); void UnmapTapeButtons(); diff --git a/src/tools.c b/src/tools.c index 2f6bd8d8..2d35e042 100644 --- a/src/tools.c +++ b/src/tools.c @@ -258,26 +258,30 @@ void BackToFront() BlitBitmap(backbuffer, window, DX, DY, DXSIZE, DYSIZE, DX, DY); if (redraw_mask & REDRAW_DOOR_2) { +#if 0 if ((redraw_mask & REDRAW_DOOR_2) == REDRAW_DOOR_2) - BlitBitmap(backbuffer, window, VX,VY, VXSIZE,VYSIZE, VX,VY); +#endif + BlitBitmap(backbuffer, window, VX, VY, VXSIZE, VYSIZE, VX, VY); +#if 0 else { if (redraw_mask & REDRAW_VIDEO_1) BlitBitmap(backbuffer, window, - VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS, - VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE, - VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS); + VX + VIDEO_DISPLAY1_XPOS, VY + VIDEO_DISPLAY1_YPOS, + VIDEO_DISPLAY_XSIZE, VIDEO_DISPLAY_YSIZE, + VX + VIDEO_DISPLAY1_XPOS, VY + VIDEO_DISPLAY1_YPOS); if (redraw_mask & REDRAW_VIDEO_2) BlitBitmap(backbuffer, window, - VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS, - VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE, - VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS); + VX + VIDEO_DISPLAY2_XPOS, VY + VIDEO_DISPLAY2_YPOS, + VIDEO_DISPLAY_XSIZE, VIDEO_DISPLAY_YSIZE, + VX + VIDEO_DISPLAY2_XPOS, VY + VIDEO_DISPLAY2_YPOS); if (redraw_mask & REDRAW_VIDEO_3) BlitBitmap(backbuffer, window, - VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS, - VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE, - VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS); + VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS, + VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE, + VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS); } +#endif } if (redraw_mask & REDRAW_DOOR_3) @@ -1658,7 +1662,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) boolean draw_masked = graphic_info[graphic].draw_masked; int mask_mode = (draw_masked ? BLIT_MASKED : BLIT_ON_BACKGROUND); boolean ffwd_delay = (tape.playing && tape.fast_forward); - boolean no_delay = (tape.index_search); + boolean no_delay = (tape.warp_forward); unsigned long anim_delay = 0; int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); int anim_delay_value = (no_delay ? 0 : frame_delay_value); @@ -1710,7 +1714,7 @@ void ShowEnvelope(int envelope_nr) int sound_opening = element_info[element].sound[ACTION_OPENING]; int sound_closing = element_info[element].sound[ACTION_CLOSING]; boolean ffwd_delay = (tape.playing && tape.fast_forward); - boolean no_delay = (tape.index_search); + boolean no_delay = (tape.warp_forward); int normal_delay_value = ONE_SECOND_DELAY / (ffwd_delay ? 2 : 1); int wait_delay_value = (no_delay ? 0 : normal_delay_value); int anim_mode = graphic_info[graphic].anim_mode; @@ -2052,11 +2056,8 @@ boolean Request(char *text, unsigned int req_state) #if 1 /* disable deactivated drawing when quick-loading level tape recording */ - if (tape.playing && tape.index_search) - { - SetDrawDeactivationMask(REDRAW_NONE); - audio.sound_deactivated = FALSE; - } + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); #endif #if 1 @@ -2324,11 +2325,8 @@ boolean Request(char *text, unsigned int req_state) #if 1 /* restore deactivated drawing when quick-loading level tape recording */ - if (tape.playing && tape.index_search) - { - SetDrawDeactivationMask(REDRAW_FIELD); - audio.sound_deactivated = TRUE; - } + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOn(); #endif return result;