rnd-20050122-1-src
authorHolger Schemel <info@artsoft.org>
Sat, 22 Jan 2005 16:11:39 +0000 (17:11 +0100)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:48:42 +0000 (10:48 +0200)
* fixed bug which caused broken tapes when appending to EM engine tapes
* uploaded pre-release (test) version 3.2.0-1 binary and source code
* added code to replace changed artwork config tokens with other tokens
  (needed for backwards compatibility, so that older tokens still work)
* added native R'n'D graphics for some new EMC elements in EM engine
* fixed some bugs in the EM engine integration code
* changed EM engine code to allow diagonal movement
* changed EM engine code to allow use of separate snap and drop keys

16 files changed:
ChangeLog
src/conf_e2g.c
src/conf_gfx.c
src/conf_gfx.h
src/conftime.h
src/game.c
src/game_em/convert.c
src/game_em/graphics.c
src/game_em/main_em.h
src/game_em/synchro_1.c
src/game_em/synchro_2.c
src/init.c
src/main.c
src/main.h
src/screens.c
src/tools.c

index c6608200378be548142aff617cff76965a8718ac..0b4402a56edc581d2f01023c7eb3097d527e9406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-01-19
+       * fixed bug which caused broken tapes when appending to EM engine tapes
+
+2005-01-17
+       * uploaded pre-release (test) version 3.2.0-1 binary and source code
+
+2005-01-17
+       * added code to replace changed artwork config tokens with other tokens
+         (needed for backwards compatibility, so that older tokens still work)
+
+2005-01-16
+       * added native R'n'D graphics for some new EMC elements in EM engine
+
+2005-01-15
+       * fixed some bugs in the EM engine integration code
+       * changed EM engine code to allow diagonal movement
+       * changed EM engine code to allow use of separate snap and drop keys
+
 2005-01-03
        * fixed some redraw bugs when using EM engine
 
index c76248a642341781533a883ca48ee55d5b575899..c9d7769dc50ec8bc58cc342e24f78ce2def31437 100644 (file)
@@ -2813,6 +2813,10 @@ element_to_graphic[] =
     EL_EMC_FAKE_GRASS,                 ACTION_ACTIVE, -1, TRUE,
     IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED
   },
+  {
+    EL_EMC_FAKE_ACID,                  -1, -1, FALSE,
+    IMG_EMC_FAKE_ACID
+  },
   {
     EL_EMC_DRIPPER,                    -1, -1, FALSE,
     IMG_EMC_DRIPPER
index f31a73f11a6a76a5b007ee3c7d204fd984f7fad9..f02df8f744b7e23cfdaad661ec424cf9ebea3f95 100644 (file)
@@ -3547,6 +3547,13 @@ struct ConfigInfo image_config[] =
   { "emc_fake_grass.active.CRUMBLED.ypos",     "4"                     },
   { "emc_fake_grass.active.CRUMBLED.frames",   "1"                     },
 
+  { "emc_fake_acid",                           "RocksElements.pcx"     },
+  { "emc_fake_acid.xpos",                      "12"                    },
+  { "emc_fake_acid.ypos",                      "7"                     },
+  { "emc_fake_acid.frames",                    "4"                     },
+  { "emc_fake_acid.delay",                     "10"                    },
+  { "emc_fake_acid.global_sync",               "true"                  },
+
   { "emc_dripper",                             "RocksSP.pcx"           },
   { "emc_dripper.xpos",                                "0"                     },
   { "emc_dripper.ypos",                                "0"                     },
index 50771b992d3c9a4bf843155da8933d694f2b6916..5559ac7d763a124970baafa38a9c125aee0f453a 100644 (file)
 #define IMG_EMC_FAKE_GRASS_CRUMBLED                    716
 #define IMG_EMC_FAKE_GRASS_ACTIVE                      717
 #define IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED             718
-#define IMG_EMC_DRIPPER                                        719
-#define IMG_EMC_DRIPPER_EDITOR                         720
-#define IMG_EMC_DRIPPER_ACTIVE                         721
-#define IMG_CHAR_SPACE                                 722
-#define IMG_CHAR_EXCLAM                                        723
-#define IMG_CHAR_QUOTEDBL                              724
-#define IMG_CHAR_NUMBERSIGN                            725
-#define IMG_CHAR_DOLLAR                                        726
-#define IMG_CHAR_PERCENT                               727
-#define IMG_CHAR_AMPERSAND                             728
-#define IMG_CHAR_APOSTROPHE                            729
-#define IMG_CHAR_PARENLEFT                             730
-#define IMG_CHAR_PARENRIGHT                            731
-#define IMG_CHAR_ASTERISK                              732
-#define IMG_CHAR_PLUS                                  733
-#define IMG_CHAR_COMMA                                 734
-#define IMG_CHAR_MINUS                                 735
-#define IMG_CHAR_PERIOD                                        736
-#define IMG_CHAR_SLASH                                 737
-#define IMG_CHAR_0                                     738
-#define IMG_CHAR_1                                     739
-#define IMG_CHAR_2                                     740
-#define IMG_CHAR_3                                     741
-#define IMG_CHAR_4                                     742
-#define IMG_CHAR_5                                     743
-#define IMG_CHAR_6                                     744
-#define IMG_CHAR_7                                     745
-#define IMG_CHAR_8                                     746
-#define IMG_CHAR_9                                     747
-#define IMG_CHAR_COLON                                 748
-#define IMG_CHAR_SEMICOLON                             749
-#define IMG_CHAR_LESS                                  750
-#define IMG_CHAR_EQUAL                                 751
-#define IMG_CHAR_GREATER                               752
-#define IMG_CHAR_QUESTION                              753
-#define IMG_CHAR_AT                                    754
-#define IMG_CHAR_A                                     755
-#define IMG_CHAR_B                                     756
-#define IMG_CHAR_C                                     757
-#define IMG_CHAR_D                                     758
-#define IMG_CHAR_E                                     759
-#define IMG_CHAR_F                                     760
-#define IMG_CHAR_G                                     761
-#define IMG_CHAR_H                                     762
-#define IMG_CHAR_I                                     763
-#define IMG_CHAR_J                                     764
-#define IMG_CHAR_K                                     765
-#define IMG_CHAR_L                                     766
-#define IMG_CHAR_M                                     767
-#define IMG_CHAR_N                                     768
-#define IMG_CHAR_O                                     769
-#define IMG_CHAR_P                                     770
-#define IMG_CHAR_Q                                     771
-#define IMG_CHAR_R                                     772
-#define IMG_CHAR_S                                     773
-#define IMG_CHAR_T                                     774
-#define IMG_CHAR_U                                     775
-#define IMG_CHAR_V                                     776
-#define IMG_CHAR_W                                     777
-#define IMG_CHAR_X                                     778
-#define IMG_CHAR_Y                                     779
-#define IMG_CHAR_Z                                     780
-#define IMG_CHAR_BRACKETLEFT                           781
-#define IMG_CHAR_BACKSLASH                             782
-#define IMG_CHAR_BRACKETRIGHT                          783
-#define IMG_CHAR_ASCIICIRCUM                           784
-#define IMG_CHAR_UNDERSCORE                            785
-#define IMG_CHAR_COPYRIGHT                             786
-#define IMG_CHAR_AUMLAUT                               787
-#define IMG_CHAR_OUMLAUT                               788
-#define IMG_CHAR_UUMLAUT                               789
-#define IMG_CHAR_DEGREE                                        790
-#define IMG_CHAR_TRADEMARK                             791
-#define IMG_CHAR_CURSOR                                        792
-#define IMG_CUSTOM_1                                   793
-#define IMG_CUSTOM_1_EDITOR                            794
-#define IMG_CUSTOM_2                                   795
-#define IMG_CUSTOM_2_EDITOR                            796
-#define IMG_CUSTOM_3                                   797
-#define IMG_CUSTOM_3_EDITOR                            798
-#define IMG_CUSTOM_4                                   799
-#define IMG_CUSTOM_4_EDITOR                            800
-#define IMG_CUSTOM_5                                   801
-#define IMG_CUSTOM_5_EDITOR                            802
-#define IMG_CUSTOM_6                                   803
-#define IMG_CUSTOM_6_EDITOR                            804
-#define IMG_CUSTOM_7                                   805
-#define IMG_CUSTOM_7_EDITOR                            806
-#define IMG_CUSTOM_8                                   807
-#define IMG_CUSTOM_8_EDITOR                            808
-#define IMG_CUSTOM_9                                   809
-#define IMG_CUSTOM_9_EDITOR                            810
-#define IMG_CUSTOM_10                                  811
-#define IMG_CUSTOM_10_EDITOR                           812
-#define IMG_CUSTOM_11                                  813
-#define IMG_CUSTOM_11_EDITOR                           814
-#define IMG_CUSTOM_12                                  815
-#define IMG_CUSTOM_12_EDITOR                           816
-#define IMG_CUSTOM_13                                  817
-#define IMG_CUSTOM_13_EDITOR                           818
-#define IMG_CUSTOM_14                                  819
-#define IMG_CUSTOM_14_EDITOR                           820
-#define IMG_CUSTOM_15                                  821
-#define IMG_CUSTOM_15_EDITOR                           822
-#define IMG_CUSTOM_16                                  823
-#define IMG_CUSTOM_16_EDITOR                           824
-#define IMG_CUSTOM_17                                  825
-#define IMG_CUSTOM_17_EDITOR                           826
-#define IMG_CUSTOM_18                                  827
-#define IMG_CUSTOM_18_EDITOR                           828
-#define IMG_CUSTOM_19                                  829
-#define IMG_CUSTOM_19_EDITOR                           830
-#define IMG_CUSTOM_20                                  831
-#define IMG_CUSTOM_20_EDITOR                           832
-#define IMG_CUSTOM_21                                  833
-#define IMG_CUSTOM_21_EDITOR                           834
-#define IMG_CUSTOM_22                                  835
-#define IMG_CUSTOM_22_EDITOR                           836
-#define IMG_CUSTOM_23                                  837
-#define IMG_CUSTOM_23_EDITOR                           838
-#define IMG_CUSTOM_24                                  839
-#define IMG_CUSTOM_24_EDITOR                           840
-#define IMG_CUSTOM_25                                  841
-#define IMG_CUSTOM_25_EDITOR                           842
-#define IMG_CUSTOM_26                                  843
-#define IMG_CUSTOM_26_EDITOR                           844
-#define IMG_CUSTOM_27                                  845
-#define IMG_CUSTOM_27_EDITOR                           846
-#define IMG_CUSTOM_28                                  847
-#define IMG_CUSTOM_28_EDITOR                           848
-#define IMG_CUSTOM_29                                  849
-#define IMG_CUSTOM_29_EDITOR                           850
-#define IMG_CUSTOM_30                                  851
-#define IMG_CUSTOM_30_EDITOR                           852
-#define IMG_CUSTOM_31                                  853
-#define IMG_CUSTOM_31_EDITOR                           854
-#define IMG_CUSTOM_32                                  855
-#define IMG_CUSTOM_32_EDITOR                           856
-#define IMG_CUSTOM_33                                  857
-#define IMG_CUSTOM_33_EDITOR                           858
-#define IMG_CUSTOM_34                                  859
-#define IMG_CUSTOM_34_EDITOR                           860
-#define IMG_CUSTOM_35                                  861
-#define IMG_CUSTOM_35_EDITOR                           862
-#define IMG_CUSTOM_36                                  863
-#define IMG_CUSTOM_36_EDITOR                           864
-#define IMG_CUSTOM_37                                  865
-#define IMG_CUSTOM_37_EDITOR                           866
-#define IMG_CUSTOM_38                                  867
-#define IMG_CUSTOM_38_EDITOR                           868
-#define IMG_CUSTOM_39                                  869
-#define IMG_CUSTOM_39_EDITOR                           870
-#define IMG_CUSTOM_40                                  871
-#define IMG_CUSTOM_40_EDITOR                           872
-#define IMG_CUSTOM_41                                  873
-#define IMG_CUSTOM_41_EDITOR                           874
-#define IMG_CUSTOM_42                                  875
-#define IMG_CUSTOM_42_EDITOR                           876
-#define IMG_CUSTOM_43                                  877
-#define IMG_CUSTOM_43_EDITOR                           878
-#define IMG_CUSTOM_44                                  879
-#define IMG_CUSTOM_44_EDITOR                           880
-#define IMG_CUSTOM_45                                  881
-#define IMG_CUSTOM_45_EDITOR                           882
-#define IMG_CUSTOM_46                                  883
-#define IMG_CUSTOM_46_EDITOR                           884
-#define IMG_CUSTOM_47                                  885
-#define IMG_CUSTOM_47_EDITOR                           886
-#define IMG_CUSTOM_48                                  887
-#define IMG_CUSTOM_48_EDITOR                           888
-#define IMG_CUSTOM_49                                  889
-#define IMG_CUSTOM_49_EDITOR                           890
-#define IMG_CUSTOM_50                                  891
-#define IMG_CUSTOM_50_EDITOR                           892
-#define IMG_CUSTOM_51                                  893
-#define IMG_CUSTOM_51_EDITOR                           894
-#define IMG_CUSTOM_52                                  895
-#define IMG_CUSTOM_52_EDITOR                           896
-#define IMG_CUSTOM_53                                  897
-#define IMG_CUSTOM_53_EDITOR                           898
-#define IMG_CUSTOM_54                                  899
-#define IMG_CUSTOM_54_EDITOR                           900
-#define IMG_CUSTOM_55                                  901
-#define IMG_CUSTOM_55_EDITOR                           902
-#define IMG_CUSTOM_56                                  903
-#define IMG_CUSTOM_56_EDITOR                           904
-#define IMG_CUSTOM_57                                  905
-#define IMG_CUSTOM_57_EDITOR                           906
-#define IMG_CUSTOM_58                                  907
-#define IMG_CUSTOM_58_EDITOR                           908
-#define IMG_CUSTOM_59                                  909
-#define IMG_CUSTOM_59_EDITOR                           910
-#define IMG_CUSTOM_60                                  911
-#define IMG_CUSTOM_60_EDITOR                           912
-#define IMG_CUSTOM_61                                  913
-#define IMG_CUSTOM_61_EDITOR                           914
-#define IMG_CUSTOM_62                                  915
-#define IMG_CUSTOM_62_EDITOR                           916
-#define IMG_CUSTOM_63                                  917
-#define IMG_CUSTOM_63_EDITOR                           918
-#define IMG_CUSTOM_64                                  919
-#define IMG_CUSTOM_64_EDITOR                           920
-#define IMG_CUSTOM_65                                  921
-#define IMG_CUSTOM_65_EDITOR                           922
-#define IMG_CUSTOM_66                                  923
-#define IMG_CUSTOM_66_EDITOR                           924
-#define IMG_CUSTOM_67                                  925
-#define IMG_CUSTOM_67_EDITOR                           926
-#define IMG_CUSTOM_68                                  927
-#define IMG_CUSTOM_68_EDITOR                           928
-#define IMG_CUSTOM_69                                  929
-#define IMG_CUSTOM_69_EDITOR                           930
-#define IMG_CUSTOM_70                                  931
-#define IMG_CUSTOM_70_EDITOR                           932
-#define IMG_CUSTOM_71                                  933
-#define IMG_CUSTOM_71_EDITOR                           934
-#define IMG_CUSTOM_72                                  935
-#define IMG_CUSTOM_72_EDITOR                           936
-#define IMG_CUSTOM_73                                  937
-#define IMG_CUSTOM_73_EDITOR                           938
-#define IMG_CUSTOM_74                                  939
-#define IMG_CUSTOM_74_EDITOR                           940
-#define IMG_CUSTOM_75                                  941
-#define IMG_CUSTOM_75_EDITOR                           942
-#define IMG_CUSTOM_76                                  943
-#define IMG_CUSTOM_76_EDITOR                           944
-#define IMG_CUSTOM_77                                  945
-#define IMG_CUSTOM_77_EDITOR                           946
-#define IMG_CUSTOM_78                                  947
-#define IMG_CUSTOM_78_EDITOR                           948
-#define IMG_CUSTOM_79                                  949
-#define IMG_CUSTOM_79_EDITOR                           950
-#define IMG_CUSTOM_80                                  951
-#define IMG_CUSTOM_80_EDITOR                           952
-#define IMG_CUSTOM_81                                  953
-#define IMG_CUSTOM_81_EDITOR                           954
-#define IMG_CUSTOM_82                                  955
-#define IMG_CUSTOM_82_EDITOR                           956
-#define IMG_CUSTOM_83                                  957
-#define IMG_CUSTOM_83_EDITOR                           958
-#define IMG_CUSTOM_84                                  959
-#define IMG_CUSTOM_84_EDITOR                           960
-#define IMG_CUSTOM_85                                  961
-#define IMG_CUSTOM_85_EDITOR                           962
-#define IMG_CUSTOM_86                                  963
-#define IMG_CUSTOM_86_EDITOR                           964
-#define IMG_CUSTOM_87                                  965
-#define IMG_CUSTOM_87_EDITOR                           966
-#define IMG_CUSTOM_88                                  967
-#define IMG_CUSTOM_88_EDITOR                           968
-#define IMG_CUSTOM_89                                  969
-#define IMG_CUSTOM_89_EDITOR                           970
-#define IMG_CUSTOM_90                                  971
-#define IMG_CUSTOM_90_EDITOR                           972
-#define IMG_CUSTOM_91                                  973
-#define IMG_CUSTOM_91_EDITOR                           974
-#define IMG_CUSTOM_92                                  975
-#define IMG_CUSTOM_92_EDITOR                           976
-#define IMG_CUSTOM_93                                  977
-#define IMG_CUSTOM_93_EDITOR                           978
-#define IMG_CUSTOM_94                                  979
-#define IMG_CUSTOM_94_EDITOR                           980
-#define IMG_CUSTOM_95                                  981
-#define IMG_CUSTOM_95_EDITOR                           982
-#define IMG_CUSTOM_96                                  983
-#define IMG_CUSTOM_96_EDITOR                           984
-#define IMG_CUSTOM_97                                  985
-#define IMG_CUSTOM_97_EDITOR                           986
-#define IMG_CUSTOM_98                                  987
-#define IMG_CUSTOM_98_EDITOR                           988
-#define IMG_CUSTOM_99                                  989
-#define IMG_CUSTOM_99_EDITOR                           990
-#define IMG_CUSTOM_100                                 991
-#define IMG_CUSTOM_100_EDITOR                          992
-#define IMG_CUSTOM_101                                 993
-#define IMG_CUSTOM_101_EDITOR                          994
-#define IMG_CUSTOM_102                                 995
-#define IMG_CUSTOM_102_EDITOR                          996
-#define IMG_CUSTOM_103                                 997
-#define IMG_CUSTOM_103_EDITOR                          998
-#define IMG_CUSTOM_104                                 999
-#define IMG_CUSTOM_104_EDITOR                          1000
-#define IMG_CUSTOM_105                                 1001
-#define IMG_CUSTOM_105_EDITOR                          1002
-#define IMG_CUSTOM_106                                 1003
-#define IMG_CUSTOM_106_EDITOR                          1004
-#define IMG_CUSTOM_107                                 1005
-#define IMG_CUSTOM_107_EDITOR                          1006
-#define IMG_CUSTOM_108                                 1007
-#define IMG_CUSTOM_108_EDITOR                          1008
-#define IMG_CUSTOM_109                                 1009
-#define IMG_CUSTOM_109_EDITOR                          1010
-#define IMG_CUSTOM_110                                 1011
-#define IMG_CUSTOM_110_EDITOR                          1012
-#define IMG_CUSTOM_111                                 1013
-#define IMG_CUSTOM_111_EDITOR                          1014
-#define IMG_CUSTOM_112                                 1015
-#define IMG_CUSTOM_112_EDITOR                          1016
-#define IMG_CUSTOM_113                                 1017
-#define IMG_CUSTOM_113_EDITOR                          1018
-#define IMG_CUSTOM_114                                 1019
-#define IMG_CUSTOM_114_EDITOR                          1020
-#define IMG_CUSTOM_115                                 1021
-#define IMG_CUSTOM_115_EDITOR                          1022
-#define IMG_CUSTOM_116                                 1023
-#define IMG_CUSTOM_116_EDITOR                          1024
-#define IMG_CUSTOM_117                                 1025
-#define IMG_CUSTOM_117_EDITOR                          1026
-#define IMG_CUSTOM_118                                 1027
-#define IMG_CUSTOM_118_EDITOR                          1028
-#define IMG_CUSTOM_119                                 1029
-#define IMG_CUSTOM_119_EDITOR                          1030
-#define IMG_CUSTOM_120                                 1031
-#define IMG_CUSTOM_120_EDITOR                          1032
-#define IMG_CUSTOM_121                                 1033
-#define IMG_CUSTOM_121_EDITOR                          1034
-#define IMG_CUSTOM_122                                 1035
-#define IMG_CUSTOM_122_EDITOR                          1036
-#define IMG_CUSTOM_123                                 1037
-#define IMG_CUSTOM_123_EDITOR                          1038
-#define IMG_CUSTOM_124                                 1039
-#define IMG_CUSTOM_124_EDITOR                          1040
-#define IMG_CUSTOM_125                                 1041
-#define IMG_CUSTOM_125_EDITOR                          1042
-#define IMG_CUSTOM_126                                 1043
-#define IMG_CUSTOM_126_EDITOR                          1044
-#define IMG_CUSTOM_127                                 1045
-#define IMG_CUSTOM_127_EDITOR                          1046
-#define IMG_CUSTOM_128                                 1047
-#define IMG_CUSTOM_128_EDITOR                          1048
-#define IMG_CUSTOM_129                                 1049
-#define IMG_CUSTOM_129_EDITOR                          1050
-#define IMG_CUSTOM_130                                 1051
-#define IMG_CUSTOM_130_EDITOR                          1052
-#define IMG_CUSTOM_131                                 1053
-#define IMG_CUSTOM_131_EDITOR                          1054
-#define IMG_CUSTOM_132                                 1055
-#define IMG_CUSTOM_132_EDITOR                          1056
-#define IMG_CUSTOM_133                                 1057
-#define IMG_CUSTOM_133_EDITOR                          1058
-#define IMG_CUSTOM_134                                 1059
-#define IMG_CUSTOM_134_EDITOR                          1060
-#define IMG_CUSTOM_135                                 1061
-#define IMG_CUSTOM_135_EDITOR                          1062
-#define IMG_CUSTOM_136                                 1063
-#define IMG_CUSTOM_136_EDITOR                          1064
-#define IMG_CUSTOM_137                                 1065
-#define IMG_CUSTOM_137_EDITOR                          1066
-#define IMG_CUSTOM_138                                 1067
-#define IMG_CUSTOM_138_EDITOR                          1068
-#define IMG_CUSTOM_139                                 1069
-#define IMG_CUSTOM_139_EDITOR                          1070
-#define IMG_CUSTOM_140                                 1071
-#define IMG_CUSTOM_140_EDITOR                          1072
-#define IMG_CUSTOM_141                                 1073
-#define IMG_CUSTOM_141_EDITOR                          1074
-#define IMG_CUSTOM_142                                 1075
-#define IMG_CUSTOM_142_EDITOR                          1076
-#define IMG_CUSTOM_143                                 1077
-#define IMG_CUSTOM_143_EDITOR                          1078
-#define IMG_CUSTOM_144                                 1079
-#define IMG_CUSTOM_144_EDITOR                          1080
-#define IMG_CUSTOM_145                                 1081
-#define IMG_CUSTOM_145_EDITOR                          1082
-#define IMG_CUSTOM_146                                 1083
-#define IMG_CUSTOM_146_EDITOR                          1084
-#define IMG_CUSTOM_147                                 1085
-#define IMG_CUSTOM_147_EDITOR                          1086
-#define IMG_CUSTOM_148                                 1087
-#define IMG_CUSTOM_148_EDITOR                          1088
-#define IMG_CUSTOM_149                                 1089
-#define IMG_CUSTOM_149_EDITOR                          1090
-#define IMG_CUSTOM_150                                 1091
-#define IMG_CUSTOM_150_EDITOR                          1092
-#define IMG_CUSTOM_151                                 1093
-#define IMG_CUSTOM_151_EDITOR                          1094
-#define IMG_CUSTOM_152                                 1095
-#define IMG_CUSTOM_152_EDITOR                          1096
-#define IMG_CUSTOM_153                                 1097
-#define IMG_CUSTOM_153_EDITOR                          1098
-#define IMG_CUSTOM_154                                 1099
-#define IMG_CUSTOM_154_EDITOR                          1100
-#define IMG_CUSTOM_155                                 1101
-#define IMG_CUSTOM_155_EDITOR                          1102
-#define IMG_CUSTOM_156                                 1103
-#define IMG_CUSTOM_156_EDITOR                          1104
-#define IMG_CUSTOM_157                                 1105
-#define IMG_CUSTOM_157_EDITOR                          1106
-#define IMG_CUSTOM_158                                 1107
-#define IMG_CUSTOM_158_EDITOR                          1108
-#define IMG_CUSTOM_159                                 1109
-#define IMG_CUSTOM_159_EDITOR                          1110
-#define IMG_CUSTOM_160                                 1111
-#define IMG_CUSTOM_160_EDITOR                          1112
-#define IMG_CUSTOM_161                                 1113
-#define IMG_CUSTOM_161_EDITOR                          1114
-#define IMG_CUSTOM_162                                 1115
-#define IMG_CUSTOM_162_EDITOR                          1116
-#define IMG_CUSTOM_163                                 1117
-#define IMG_CUSTOM_163_EDITOR                          1118
-#define IMG_CUSTOM_164                                 1119
-#define IMG_CUSTOM_164_EDITOR                          1120
-#define IMG_CUSTOM_165                                 1121
-#define IMG_CUSTOM_165_EDITOR                          1122
-#define IMG_CUSTOM_166                                 1123
-#define IMG_CUSTOM_166_EDITOR                          1124
-#define IMG_CUSTOM_167                                 1125
-#define IMG_CUSTOM_167_EDITOR                          1126
-#define IMG_CUSTOM_168                                 1127
-#define IMG_CUSTOM_168_EDITOR                          1128
-#define IMG_CUSTOM_169                                 1129
-#define IMG_CUSTOM_169_EDITOR                          1130
-#define IMG_CUSTOM_170                                 1131
-#define IMG_CUSTOM_170_EDITOR                          1132
-#define IMG_CUSTOM_171                                 1133
-#define IMG_CUSTOM_171_EDITOR                          1134
-#define IMG_CUSTOM_172                                 1135
-#define IMG_CUSTOM_172_EDITOR                          1136
-#define IMG_CUSTOM_173                                 1137
-#define IMG_CUSTOM_173_EDITOR                          1138
-#define IMG_CUSTOM_174                                 1139
-#define IMG_CUSTOM_174_EDITOR                          1140
-#define IMG_CUSTOM_175                                 1141
-#define IMG_CUSTOM_175_EDITOR                          1142
-#define IMG_CUSTOM_176                                 1143
-#define IMG_CUSTOM_176_EDITOR                          1144
-#define IMG_CUSTOM_177                                 1145
-#define IMG_CUSTOM_177_EDITOR                          1146
-#define IMG_CUSTOM_178                                 1147
-#define IMG_CUSTOM_178_EDITOR                          1148
-#define IMG_CUSTOM_179                                 1149
-#define IMG_CUSTOM_179_EDITOR                          1150
-#define IMG_CUSTOM_180                                 1151
-#define IMG_CUSTOM_180_EDITOR                          1152
-#define IMG_CUSTOM_181                                 1153
-#define IMG_CUSTOM_181_EDITOR                          1154
-#define IMG_CUSTOM_182                                 1155
-#define IMG_CUSTOM_182_EDITOR                          1156
-#define IMG_CUSTOM_183                                 1157
-#define IMG_CUSTOM_183_EDITOR                          1158
-#define IMG_CUSTOM_184                                 1159
-#define IMG_CUSTOM_184_EDITOR                          1160
-#define IMG_CUSTOM_185                                 1161
-#define IMG_CUSTOM_185_EDITOR                          1162
-#define IMG_CUSTOM_186                                 1163
-#define IMG_CUSTOM_186_EDITOR                          1164
-#define IMG_CUSTOM_187                                 1165
-#define IMG_CUSTOM_187_EDITOR                          1166
-#define IMG_CUSTOM_188                                 1167
-#define IMG_CUSTOM_188_EDITOR                          1168
-#define IMG_CUSTOM_189                                 1169
-#define IMG_CUSTOM_189_EDITOR                          1170
-#define IMG_CUSTOM_190                                 1171
-#define IMG_CUSTOM_190_EDITOR                          1172
-#define IMG_CUSTOM_191                                 1173
-#define IMG_CUSTOM_191_EDITOR                          1174
-#define IMG_CUSTOM_192                                 1175
-#define IMG_CUSTOM_192_EDITOR                          1176
-#define IMG_CUSTOM_193                                 1177
-#define IMG_CUSTOM_193_EDITOR                          1178
-#define IMG_CUSTOM_194                                 1179
-#define IMG_CUSTOM_194_EDITOR                          1180
-#define IMG_CUSTOM_195                                 1181
-#define IMG_CUSTOM_195_EDITOR                          1182
-#define IMG_CUSTOM_196                                 1183
-#define IMG_CUSTOM_196_EDITOR                          1184
-#define IMG_CUSTOM_197                                 1185
-#define IMG_CUSTOM_197_EDITOR                          1186
-#define IMG_CUSTOM_198                                 1187
-#define IMG_CUSTOM_198_EDITOR                          1188
-#define IMG_CUSTOM_199                                 1189
-#define IMG_CUSTOM_199_EDITOR                          1190
-#define IMG_CUSTOM_200                                 1191
-#define IMG_CUSTOM_200_EDITOR                          1192
-#define IMG_CUSTOM_201                                 1193
-#define IMG_CUSTOM_201_EDITOR                          1194
-#define IMG_CUSTOM_202                                 1195
-#define IMG_CUSTOM_202_EDITOR                          1196
-#define IMG_CUSTOM_203                                 1197
-#define IMG_CUSTOM_203_EDITOR                          1198
-#define IMG_CUSTOM_204                                 1199
-#define IMG_CUSTOM_204_EDITOR                          1200
-#define IMG_CUSTOM_205                                 1201
-#define IMG_CUSTOM_205_EDITOR                          1202
-#define IMG_CUSTOM_206                                 1203
-#define IMG_CUSTOM_206_EDITOR                          1204
-#define IMG_CUSTOM_207                                 1205
-#define IMG_CUSTOM_207_EDITOR                          1206
-#define IMG_CUSTOM_208                                 1207
-#define IMG_CUSTOM_208_EDITOR                          1208
-#define IMG_CUSTOM_209                                 1209
-#define IMG_CUSTOM_209_EDITOR                          1210
-#define IMG_CUSTOM_210                                 1211
-#define IMG_CUSTOM_210_EDITOR                          1212
-#define IMG_CUSTOM_211                                 1213
-#define IMG_CUSTOM_211_EDITOR                          1214
-#define IMG_CUSTOM_212                                 1215
-#define IMG_CUSTOM_212_EDITOR                          1216
-#define IMG_CUSTOM_213                                 1217
-#define IMG_CUSTOM_213_EDITOR                          1218
-#define IMG_CUSTOM_214                                 1219
-#define IMG_CUSTOM_214_EDITOR                          1220
-#define IMG_CUSTOM_215                                 1221
-#define IMG_CUSTOM_215_EDITOR                          1222
-#define IMG_CUSTOM_216                                 1223
-#define IMG_CUSTOM_216_EDITOR                          1224
-#define IMG_CUSTOM_217                                 1225
-#define IMG_CUSTOM_217_EDITOR                          1226
-#define IMG_CUSTOM_218                                 1227
-#define IMG_CUSTOM_218_EDITOR                          1228
-#define IMG_CUSTOM_219                                 1229
-#define IMG_CUSTOM_219_EDITOR                          1230
-#define IMG_CUSTOM_220                                 1231
-#define IMG_CUSTOM_220_EDITOR                          1232
-#define IMG_CUSTOM_221                                 1233
-#define IMG_CUSTOM_221_EDITOR                          1234
-#define IMG_CUSTOM_222                                 1235
-#define IMG_CUSTOM_222_EDITOR                          1236
-#define IMG_CUSTOM_223                                 1237
-#define IMG_CUSTOM_223_EDITOR                          1238
-#define IMG_CUSTOM_224                                 1239
-#define IMG_CUSTOM_224_EDITOR                          1240
-#define IMG_CUSTOM_225                                 1241
-#define IMG_CUSTOM_225_EDITOR                          1242
-#define IMG_CUSTOM_226                                 1243
-#define IMG_CUSTOM_226_EDITOR                          1244
-#define IMG_CUSTOM_227                                 1245
-#define IMG_CUSTOM_227_EDITOR                          1246
-#define IMG_CUSTOM_228                                 1247
-#define IMG_CUSTOM_228_EDITOR                          1248
-#define IMG_CUSTOM_229                                 1249
-#define IMG_CUSTOM_229_EDITOR                          1250
-#define IMG_CUSTOM_230                                 1251
-#define IMG_CUSTOM_230_EDITOR                          1252
-#define IMG_CUSTOM_231                                 1253
-#define IMG_CUSTOM_231_EDITOR                          1254
-#define IMG_CUSTOM_232                                 1255
-#define IMG_CUSTOM_232_EDITOR                          1256
-#define IMG_CUSTOM_233                                 1257
-#define IMG_CUSTOM_233_EDITOR                          1258
-#define IMG_CUSTOM_234                                 1259
-#define IMG_CUSTOM_234_EDITOR                          1260
-#define IMG_CUSTOM_235                                 1261
-#define IMG_CUSTOM_235_EDITOR                          1262
-#define IMG_CUSTOM_236                                 1263
-#define IMG_CUSTOM_236_EDITOR                          1264
-#define IMG_CUSTOM_237                                 1265
-#define IMG_CUSTOM_237_EDITOR                          1266
-#define IMG_CUSTOM_238                                 1267
-#define IMG_CUSTOM_238_EDITOR                          1268
-#define IMG_CUSTOM_239                                 1269
-#define IMG_CUSTOM_239_EDITOR                          1270
-#define IMG_CUSTOM_240                                 1271
-#define IMG_CUSTOM_240_EDITOR                          1272
-#define IMG_CUSTOM_241                                 1273
-#define IMG_CUSTOM_241_EDITOR                          1274
-#define IMG_CUSTOM_242                                 1275
-#define IMG_CUSTOM_242_EDITOR                          1276
-#define IMG_CUSTOM_243                                 1277
-#define IMG_CUSTOM_243_EDITOR                          1278
-#define IMG_CUSTOM_244                                 1279
-#define IMG_CUSTOM_244_EDITOR                          1280
-#define IMG_CUSTOM_245                                 1281
-#define IMG_CUSTOM_245_EDITOR                          1282
-#define IMG_CUSTOM_246                                 1283
-#define IMG_CUSTOM_246_EDITOR                          1284
-#define IMG_CUSTOM_247                                 1285
-#define IMG_CUSTOM_247_EDITOR                          1286
-#define IMG_CUSTOM_248                                 1287
-#define IMG_CUSTOM_248_EDITOR                          1288
-#define IMG_CUSTOM_249                                 1289
-#define IMG_CUSTOM_249_EDITOR                          1290
-#define IMG_CUSTOM_250                                 1291
-#define IMG_CUSTOM_250_EDITOR                          1292
-#define IMG_CUSTOM_251                                 1293
-#define IMG_CUSTOM_251_EDITOR                          1294
-#define IMG_CUSTOM_252                                 1295
-#define IMG_CUSTOM_252_EDITOR                          1296
-#define IMG_CUSTOM_253                                 1297
-#define IMG_CUSTOM_253_EDITOR                          1298
-#define IMG_CUSTOM_254                                 1299
-#define IMG_CUSTOM_254_EDITOR                          1300
-#define IMG_CUSTOM_255                                 1301
-#define IMG_CUSTOM_255_EDITOR                          1302
-#define IMG_CUSTOM_256                                 1303
-#define IMG_CUSTOM_256_EDITOR                          1304
-#define IMG_GROUP_1                                    1305
-#define IMG_GROUP_1_EDITOR                             1306
-#define IMG_GROUP_2                                    1307
-#define IMG_GROUP_2_EDITOR                             1308
-#define IMG_GROUP_3                                    1309
-#define IMG_GROUP_3_EDITOR                             1310
-#define IMG_GROUP_4                                    1311
-#define IMG_GROUP_4_EDITOR                             1312
-#define IMG_GROUP_5                                    1313
-#define IMG_GROUP_5_EDITOR                             1314
-#define IMG_GROUP_6                                    1315
-#define IMG_GROUP_6_EDITOR                             1316
-#define IMG_GROUP_7                                    1317
-#define IMG_GROUP_7_EDITOR                             1318
-#define IMG_GROUP_8                                    1319
-#define IMG_GROUP_8_EDITOR                             1320
-#define IMG_GROUP_9                                    1321
-#define IMG_GROUP_9_EDITOR                             1322
-#define IMG_GROUP_10                                   1323
-#define IMG_GROUP_10_EDITOR                            1324
-#define IMG_GROUP_11                                   1325
-#define IMG_GROUP_11_EDITOR                            1326
-#define IMG_GROUP_12                                   1327
-#define IMG_GROUP_12_EDITOR                            1328
-#define IMG_GROUP_13                                   1329
-#define IMG_GROUP_13_EDITOR                            1330
-#define IMG_GROUP_14                                   1331
-#define IMG_GROUP_14_EDITOR                            1332
-#define IMG_GROUP_15                                   1333
-#define IMG_GROUP_15_EDITOR                            1334
-#define IMG_GROUP_16                                   1335
-#define IMG_GROUP_16_EDITOR                            1336
-#define IMG_GROUP_17                                   1337
-#define IMG_GROUP_17_EDITOR                            1338
-#define IMG_GROUP_18                                   1339
-#define IMG_GROUP_18_EDITOR                            1340
-#define IMG_GROUP_19                                   1341
-#define IMG_GROUP_19_EDITOR                            1342
-#define IMG_GROUP_20                                   1343
-#define IMG_GROUP_20_EDITOR                            1344
-#define IMG_GROUP_21                                   1345
-#define IMG_GROUP_21_EDITOR                            1346
-#define IMG_GROUP_22                                   1347
-#define IMG_GROUP_22_EDITOR                            1348
-#define IMG_GROUP_23                                   1349
-#define IMG_GROUP_23_EDITOR                            1350
-#define IMG_GROUP_24                                   1351
-#define IMG_GROUP_24_EDITOR                            1352
-#define IMG_GROUP_25                                   1353
-#define IMG_GROUP_25_EDITOR                            1354
-#define IMG_GROUP_26                                   1355
-#define IMG_GROUP_26_EDITOR                            1356
-#define IMG_GROUP_27                                   1357
-#define IMG_GROUP_27_EDITOR                            1358
-#define IMG_GROUP_28                                   1359
-#define IMG_GROUP_28_EDITOR                            1360
-#define IMG_GROUP_29                                   1361
-#define IMG_GROUP_29_EDITOR                            1362
-#define IMG_GROUP_30                                   1363
-#define IMG_GROUP_30_EDITOR                            1364
-#define IMG_GROUP_31                                   1365
-#define IMG_GROUP_31_EDITOR                            1366
-#define IMG_GROUP_32                                   1367
-#define IMG_GROUP_32_EDITOR                            1368
-#define IMG_EMC_OBJECT                                 1369
-#define IMG_EMC_SPRITE                                 1370
-#define IMG_TOON_1                                     1371
-#define IMG_TOON_2                                     1372
-#define IMG_TOON_3                                     1373
-#define IMG_TOON_4                                     1374
-#define IMG_TOON_5                                     1375
-#define IMG_TOON_6                                     1376
-#define IMG_TOON_7                                     1377
-#define IMG_TOON_8                                     1378
-#define IMG_TOON_9                                     1379
-#define IMG_TOON_10                                    1380
-#define IMG_TOON_11                                    1381
-#define IMG_TOON_12                                    1382
-#define IMG_TOON_13                                    1383
-#define IMG_TOON_14                                    1384
-#define IMG_TOON_15                                    1385
-#define IMG_TOON_16                                    1386
-#define IMG_TOON_17                                    1387
-#define IMG_TOON_18                                    1388
-#define IMG_TOON_19                                    1389
-#define IMG_TOON_20                                    1390
-#define IMG_MENU_CALIBRATE_RED                         1391
-#define IMG_MENU_CALIBRATE_BLUE                                1392
-#define IMG_MENU_CALIBRATE_YELLOW                      1393
-#define IMG_MENU_BUTTON                                        1394
-#define IMG_MENU_BUTTON_ACTIVE                         1395
-#define IMG_MENU_BUTTON_LEFT                           1396
-#define IMG_MENU_BUTTON_RIGHT                          1397
-#define IMG_MENU_BUTTON_UP                             1398
-#define IMG_MENU_BUTTON_DOWN                           1399
-#define IMG_MENU_BUTTON_LEFT_ACTIVE                    1400
-#define IMG_MENU_BUTTON_RIGHT_ACTIVE                   1401
-#define IMG_MENU_BUTTON_UP_ACTIVE                      1402
-#define IMG_MENU_BUTTON_DOWN_ACTIVE                    1403
-#define IMG_MENU_SCROLLBAR                             1404
-#define IMG_MENU_SCROLLBAR_ACTIVE                      1405
-#define IMG_FONT_INITIAL_1                             1406
-#define IMG_FONT_INITIAL_2                             1407
-#define IMG_FONT_INITIAL_3                             1408
-#define IMG_FONT_INITIAL_4                             1409
-#define IMG_FONT_TITLE_1                               1410
-#define IMG_FONT_TITLE_1_LEVELS                                1411
-#define IMG_FONT_TITLE_2                               1412
-#define IMG_FONT_MENU_1                                        1413
-#define IMG_FONT_MENU_2                                        1414
-#define IMG_FONT_TEXT_1                                        1415
-#define IMG_FONT_TEXT_1_LEVELS                         1416
-#define IMG_FONT_TEXT_1_PREVIEW                                1417
-#define IMG_FONT_TEXT_1_SCORES                         1418
-#define IMG_FONT_TEXT_1_ACTIVE_SCORES                  1419
-#define IMG_FONT_TEXT_2                                        1420
-#define IMG_FONT_TEXT_2_LEVELS                         1421
-#define IMG_FONT_TEXT_2_PREVIEW                                1422
-#define IMG_FONT_TEXT_2_SCORES                         1423
-#define IMG_FONT_TEXT_2_ACTIVE_SCORES                  1424
-#define IMG_FONT_TEXT_3                                        1425
-#define IMG_FONT_TEXT_3_LEVELS                         1426
-#define IMG_FONT_TEXT_3_PREVIEW                                1427
-#define IMG_FONT_TEXT_3_SCORES                         1428
-#define IMG_FONT_TEXT_3_ACTIVE_SCORES                  1429
-#define IMG_FONT_TEXT_4                                        1430
-#define IMG_FONT_TEXT_4_LEVELS                         1431
-#define IMG_FONT_TEXT_4_SCORES                         1432
-#define IMG_FONT_TEXT_4_ACTIVE_SCORES                  1433
-#define IMG_FONT_ENVELOPE_1                            1434
-#define IMG_FONT_ENVELOPE_2                            1435
-#define IMG_FONT_ENVELOPE_3                            1436
-#define IMG_FONT_ENVELOPE_4                            1437
-#define IMG_FONT_INPUT_1                               1438
-#define IMG_FONT_INPUT_1_MAIN                          1439
-#define IMG_FONT_INPUT_1_ACTIVE                                1440
-#define IMG_FONT_INPUT_1_ACTIVE_MAIN                   1441
-#define IMG_FONT_INPUT_1_ACTIVE_SETUP                  1442
-#define IMG_FONT_INPUT_2                               1443
-#define IMG_FONT_INPUT_2_ACTIVE                                1444
-#define IMG_FONT_OPTION_OFF                            1445
-#define IMG_FONT_OPTION_ON                             1446
-#define IMG_FONT_VALUE_1                               1447
-#define IMG_FONT_VALUE_2                               1448
-#define IMG_FONT_VALUE_OLD                             1449
-#define IMG_FONT_LEVEL_NUMBER                          1450
-#define IMG_FONT_TAPE_RECORDER                         1451
-#define IMG_FONT_GAME_INFO                             1452
-#define IMG_GLOBAL_BORDER                              1453
-#define IMG_GLOBAL_DOOR                                        1454
-#define IMG_EDITOR_ELEMENT_BORDER                      1455
-#define IMG_EDITOR_ELEMENT_BORDER_INPUT                        1456
-#define IMG_BACKGROUND_ENVELOPE_1                      1457
-#define IMG_BACKGROUND_ENVELOPE_2                      1458
-#define IMG_BACKGROUND_ENVELOPE_3                      1459
-#define IMG_BACKGROUND_ENVELOPE_4                      1460
-#define IMG_BACKGROUND                                 1461
-#define IMG_BACKGROUND_MAIN                            1462
-#define IMG_BACKGROUND_LEVELS                          1463
-#define IMG_BACKGROUND_SCORES                          1464
-#define IMG_BACKGROUND_EDITOR                          1465
-#define IMG_BACKGROUND_INFO                            1466
-#define IMG_BACKGROUND_INFO_ELEMENTS                   1467
-#define IMG_BACKGROUND_SETUP                           1468
-#define IMG_BACKGROUND_DOOR                            1469
+#define IMG_EMC_FAKE_ACID                              719
+#define IMG_EMC_DRIPPER                                        720
+#define IMG_EMC_DRIPPER_EDITOR                         721
+#define IMG_EMC_DRIPPER_ACTIVE                         722
+#define IMG_CHAR_SPACE                                 723
+#define IMG_CHAR_EXCLAM                                        724
+#define IMG_CHAR_QUOTEDBL                              725
+#define IMG_CHAR_NUMBERSIGN                            726
+#define IMG_CHAR_DOLLAR                                        727
+#define IMG_CHAR_PERCENT                               728
+#define IMG_CHAR_AMPERSAND                             729
+#define IMG_CHAR_APOSTROPHE                            730
+#define IMG_CHAR_PARENLEFT                             731
+#define IMG_CHAR_PARENRIGHT                            732
+#define IMG_CHAR_ASTERISK                              733
+#define IMG_CHAR_PLUS                                  734
+#define IMG_CHAR_COMMA                                 735
+#define IMG_CHAR_MINUS                                 736
+#define IMG_CHAR_PERIOD                                        737
+#define IMG_CHAR_SLASH                                 738
+#define IMG_CHAR_0                                     739
+#define IMG_CHAR_1                                     740
+#define IMG_CHAR_2                                     741
+#define IMG_CHAR_3                                     742
+#define IMG_CHAR_4                                     743
+#define IMG_CHAR_5                                     744
+#define IMG_CHAR_6                                     745
+#define IMG_CHAR_7                                     746
+#define IMG_CHAR_8                                     747
+#define IMG_CHAR_9                                     748
+#define IMG_CHAR_COLON                                 749
+#define IMG_CHAR_SEMICOLON                             750
+#define IMG_CHAR_LESS                                  751
+#define IMG_CHAR_EQUAL                                 752
+#define IMG_CHAR_GREATER                               753
+#define IMG_CHAR_QUESTION                              754
+#define IMG_CHAR_AT                                    755
+#define IMG_CHAR_A                                     756
+#define IMG_CHAR_B                                     757
+#define IMG_CHAR_C                                     758
+#define IMG_CHAR_D                                     759
+#define IMG_CHAR_E                                     760
+#define IMG_CHAR_F                                     761
+#define IMG_CHAR_G                                     762
+#define IMG_CHAR_H                                     763
+#define IMG_CHAR_I                                     764
+#define IMG_CHAR_J                                     765
+#define IMG_CHAR_K                                     766
+#define IMG_CHAR_L                                     767
+#define IMG_CHAR_M                                     768
+#define IMG_CHAR_N                                     769
+#define IMG_CHAR_O                                     770
+#define IMG_CHAR_P                                     771
+#define IMG_CHAR_Q                                     772
+#define IMG_CHAR_R                                     773
+#define IMG_CHAR_S                                     774
+#define IMG_CHAR_T                                     775
+#define IMG_CHAR_U                                     776
+#define IMG_CHAR_V                                     777
+#define IMG_CHAR_W                                     778
+#define IMG_CHAR_X                                     779
+#define IMG_CHAR_Y                                     780
+#define IMG_CHAR_Z                                     781
+#define IMG_CHAR_BRACKETLEFT                           782
+#define IMG_CHAR_BACKSLASH                             783
+#define IMG_CHAR_BRACKETRIGHT                          784
+#define IMG_CHAR_ASCIICIRCUM                           785
+#define IMG_CHAR_UNDERSCORE                            786
+#define IMG_CHAR_COPYRIGHT                             787
+#define IMG_CHAR_AUMLAUT                               788
+#define IMG_CHAR_OUMLAUT                               789
+#define IMG_CHAR_UUMLAUT                               790
+#define IMG_CHAR_DEGREE                                        791
+#define IMG_CHAR_TRADEMARK                             792
+#define IMG_CHAR_CURSOR                                        793
+#define IMG_CUSTOM_1                                   794
+#define IMG_CUSTOM_1_EDITOR                            795
+#define IMG_CUSTOM_2                                   796
+#define IMG_CUSTOM_2_EDITOR                            797
+#define IMG_CUSTOM_3                                   798
+#define IMG_CUSTOM_3_EDITOR                            799
+#define IMG_CUSTOM_4                                   800
+#define IMG_CUSTOM_4_EDITOR                            801
+#define IMG_CUSTOM_5                                   802
+#define IMG_CUSTOM_5_EDITOR                            803
+#define IMG_CUSTOM_6                                   804
+#define IMG_CUSTOM_6_EDITOR                            805
+#define IMG_CUSTOM_7                                   806
+#define IMG_CUSTOM_7_EDITOR                            807
+#define IMG_CUSTOM_8                                   808
+#define IMG_CUSTOM_8_EDITOR                            809
+#define IMG_CUSTOM_9                                   810
+#define IMG_CUSTOM_9_EDITOR                            811
+#define IMG_CUSTOM_10                                  812
+#define IMG_CUSTOM_10_EDITOR                           813
+#define IMG_CUSTOM_11                                  814
+#define IMG_CUSTOM_11_EDITOR                           815
+#define IMG_CUSTOM_12                                  816
+#define IMG_CUSTOM_12_EDITOR                           817
+#define IMG_CUSTOM_13                                  818
+#define IMG_CUSTOM_13_EDITOR                           819
+#define IMG_CUSTOM_14                                  820
+#define IMG_CUSTOM_14_EDITOR                           821
+#define IMG_CUSTOM_15                                  822
+#define IMG_CUSTOM_15_EDITOR                           823
+#define IMG_CUSTOM_16                                  824
+#define IMG_CUSTOM_16_EDITOR                           825
+#define IMG_CUSTOM_17                                  826
+#define IMG_CUSTOM_17_EDITOR                           827
+#define IMG_CUSTOM_18                                  828
+#define IMG_CUSTOM_18_EDITOR                           829
+#define IMG_CUSTOM_19                                  830
+#define IMG_CUSTOM_19_EDITOR                           831
+#define IMG_CUSTOM_20                                  832
+#define IMG_CUSTOM_20_EDITOR                           833
+#define IMG_CUSTOM_21                                  834
+#define IMG_CUSTOM_21_EDITOR                           835
+#define IMG_CUSTOM_22                                  836
+#define IMG_CUSTOM_22_EDITOR                           837
+#define IMG_CUSTOM_23                                  838
+#define IMG_CUSTOM_23_EDITOR                           839
+#define IMG_CUSTOM_24                                  840
+#define IMG_CUSTOM_24_EDITOR                           841
+#define IMG_CUSTOM_25                                  842
+#define IMG_CUSTOM_25_EDITOR                           843
+#define IMG_CUSTOM_26                                  844
+#define IMG_CUSTOM_26_EDITOR                           845
+#define IMG_CUSTOM_27                                  846
+#define IMG_CUSTOM_27_EDITOR                           847
+#define IMG_CUSTOM_28                                  848
+#define IMG_CUSTOM_28_EDITOR                           849
+#define IMG_CUSTOM_29                                  850
+#define IMG_CUSTOM_29_EDITOR                           851
+#define IMG_CUSTOM_30                                  852
+#define IMG_CUSTOM_30_EDITOR                           853
+#define IMG_CUSTOM_31                                  854
+#define IMG_CUSTOM_31_EDITOR                           855
+#define IMG_CUSTOM_32                                  856
+#define IMG_CUSTOM_32_EDITOR                           857
+#define IMG_CUSTOM_33                                  858
+#define IMG_CUSTOM_33_EDITOR                           859
+#define IMG_CUSTOM_34                                  860
+#define IMG_CUSTOM_34_EDITOR                           861
+#define IMG_CUSTOM_35                                  862
+#define IMG_CUSTOM_35_EDITOR                           863
+#define IMG_CUSTOM_36                                  864
+#define IMG_CUSTOM_36_EDITOR                           865
+#define IMG_CUSTOM_37                                  866
+#define IMG_CUSTOM_37_EDITOR                           867
+#define IMG_CUSTOM_38                                  868
+#define IMG_CUSTOM_38_EDITOR                           869
+#define IMG_CUSTOM_39                                  870
+#define IMG_CUSTOM_39_EDITOR                           871
+#define IMG_CUSTOM_40                                  872
+#define IMG_CUSTOM_40_EDITOR                           873
+#define IMG_CUSTOM_41                                  874
+#define IMG_CUSTOM_41_EDITOR                           875
+#define IMG_CUSTOM_42                                  876
+#define IMG_CUSTOM_42_EDITOR                           877
+#define IMG_CUSTOM_43                                  878
+#define IMG_CUSTOM_43_EDITOR                           879
+#define IMG_CUSTOM_44                                  880
+#define IMG_CUSTOM_44_EDITOR                           881
+#define IMG_CUSTOM_45                                  882
+#define IMG_CUSTOM_45_EDITOR                           883
+#define IMG_CUSTOM_46                                  884
+#define IMG_CUSTOM_46_EDITOR                           885
+#define IMG_CUSTOM_47                                  886
+#define IMG_CUSTOM_47_EDITOR                           887
+#define IMG_CUSTOM_48                                  888
+#define IMG_CUSTOM_48_EDITOR                           889
+#define IMG_CUSTOM_49                                  890
+#define IMG_CUSTOM_49_EDITOR                           891
+#define IMG_CUSTOM_50                                  892
+#define IMG_CUSTOM_50_EDITOR                           893
+#define IMG_CUSTOM_51                                  894
+#define IMG_CUSTOM_51_EDITOR                           895
+#define IMG_CUSTOM_52                                  896
+#define IMG_CUSTOM_52_EDITOR                           897
+#define IMG_CUSTOM_53                                  898
+#define IMG_CUSTOM_53_EDITOR                           899
+#define IMG_CUSTOM_54                                  900
+#define IMG_CUSTOM_54_EDITOR                           901
+#define IMG_CUSTOM_55                                  902
+#define IMG_CUSTOM_55_EDITOR                           903
+#define IMG_CUSTOM_56                                  904
+#define IMG_CUSTOM_56_EDITOR                           905
+#define IMG_CUSTOM_57                                  906
+#define IMG_CUSTOM_57_EDITOR                           907
+#define IMG_CUSTOM_58                                  908
+#define IMG_CUSTOM_58_EDITOR                           909
+#define IMG_CUSTOM_59                                  910
+#define IMG_CUSTOM_59_EDITOR                           911
+#define IMG_CUSTOM_60                                  912
+#define IMG_CUSTOM_60_EDITOR                           913
+#define IMG_CUSTOM_61                                  914
+#define IMG_CUSTOM_61_EDITOR                           915
+#define IMG_CUSTOM_62                                  916
+#define IMG_CUSTOM_62_EDITOR                           917
+#define IMG_CUSTOM_63                                  918
+#define IMG_CUSTOM_63_EDITOR                           919
+#define IMG_CUSTOM_64                                  920
+#define IMG_CUSTOM_64_EDITOR                           921
+#define IMG_CUSTOM_65                                  922
+#define IMG_CUSTOM_65_EDITOR                           923
+#define IMG_CUSTOM_66                                  924
+#define IMG_CUSTOM_66_EDITOR                           925
+#define IMG_CUSTOM_67                                  926
+#define IMG_CUSTOM_67_EDITOR                           927
+#define IMG_CUSTOM_68                                  928
+#define IMG_CUSTOM_68_EDITOR                           929
+#define IMG_CUSTOM_69                                  930
+#define IMG_CUSTOM_69_EDITOR                           931
+#define IMG_CUSTOM_70                                  932
+#define IMG_CUSTOM_70_EDITOR                           933
+#define IMG_CUSTOM_71                                  934
+#define IMG_CUSTOM_71_EDITOR                           935
+#define IMG_CUSTOM_72                                  936
+#define IMG_CUSTOM_72_EDITOR                           937
+#define IMG_CUSTOM_73                                  938
+#define IMG_CUSTOM_73_EDITOR                           939
+#define IMG_CUSTOM_74                                  940
+#define IMG_CUSTOM_74_EDITOR                           941
+#define IMG_CUSTOM_75                                  942
+#define IMG_CUSTOM_75_EDITOR                           943
+#define IMG_CUSTOM_76                                  944
+#define IMG_CUSTOM_76_EDITOR                           945
+#define IMG_CUSTOM_77                                  946
+#define IMG_CUSTOM_77_EDITOR                           947
+#define IMG_CUSTOM_78                                  948
+#define IMG_CUSTOM_78_EDITOR                           949
+#define IMG_CUSTOM_79                                  950
+#define IMG_CUSTOM_79_EDITOR                           951
+#define IMG_CUSTOM_80                                  952
+#define IMG_CUSTOM_80_EDITOR                           953
+#define IMG_CUSTOM_81                                  954
+#define IMG_CUSTOM_81_EDITOR                           955
+#define IMG_CUSTOM_82                                  956
+#define IMG_CUSTOM_82_EDITOR                           957
+#define IMG_CUSTOM_83                                  958
+#define IMG_CUSTOM_83_EDITOR                           959
+#define IMG_CUSTOM_84                                  960
+#define IMG_CUSTOM_84_EDITOR                           961
+#define IMG_CUSTOM_85                                  962
+#define IMG_CUSTOM_85_EDITOR                           963
+#define IMG_CUSTOM_86                                  964
+#define IMG_CUSTOM_86_EDITOR                           965
+#define IMG_CUSTOM_87                                  966
+#define IMG_CUSTOM_87_EDITOR                           967
+#define IMG_CUSTOM_88                                  968
+#define IMG_CUSTOM_88_EDITOR                           969
+#define IMG_CUSTOM_89                                  970
+#define IMG_CUSTOM_89_EDITOR                           971
+#define IMG_CUSTOM_90                                  972
+#define IMG_CUSTOM_90_EDITOR                           973
+#define IMG_CUSTOM_91                                  974
+#define IMG_CUSTOM_91_EDITOR                           975
+#define IMG_CUSTOM_92                                  976
+#define IMG_CUSTOM_92_EDITOR                           977
+#define IMG_CUSTOM_93                                  978
+#define IMG_CUSTOM_93_EDITOR                           979
+#define IMG_CUSTOM_94                                  980
+#define IMG_CUSTOM_94_EDITOR                           981
+#define IMG_CUSTOM_95                                  982
+#define IMG_CUSTOM_95_EDITOR                           983
+#define IMG_CUSTOM_96                                  984
+#define IMG_CUSTOM_96_EDITOR                           985
+#define IMG_CUSTOM_97                                  986
+#define IMG_CUSTOM_97_EDITOR                           987
+#define IMG_CUSTOM_98                                  988
+#define IMG_CUSTOM_98_EDITOR                           989
+#define IMG_CUSTOM_99                                  990
+#define IMG_CUSTOM_99_EDITOR                           991
+#define IMG_CUSTOM_100                                 992
+#define IMG_CUSTOM_100_EDITOR                          993
+#define IMG_CUSTOM_101                                 994
+#define IMG_CUSTOM_101_EDITOR                          995
+#define IMG_CUSTOM_102                                 996
+#define IMG_CUSTOM_102_EDITOR                          997
+#define IMG_CUSTOM_103                                 998
+#define IMG_CUSTOM_103_EDITOR                          999
+#define IMG_CUSTOM_104                                 1000
+#define IMG_CUSTOM_104_EDITOR                          1001
+#define IMG_CUSTOM_105                                 1002
+#define IMG_CUSTOM_105_EDITOR                          1003
+#define IMG_CUSTOM_106                                 1004
+#define IMG_CUSTOM_106_EDITOR                          1005
+#define IMG_CUSTOM_107                                 1006
+#define IMG_CUSTOM_107_EDITOR                          1007
+#define IMG_CUSTOM_108                                 1008
+#define IMG_CUSTOM_108_EDITOR                          1009
+#define IMG_CUSTOM_109                                 1010
+#define IMG_CUSTOM_109_EDITOR                          1011
+#define IMG_CUSTOM_110                                 1012
+#define IMG_CUSTOM_110_EDITOR                          1013
+#define IMG_CUSTOM_111                                 1014
+#define IMG_CUSTOM_111_EDITOR                          1015
+#define IMG_CUSTOM_112                                 1016
+#define IMG_CUSTOM_112_EDITOR                          1017
+#define IMG_CUSTOM_113                                 1018
+#define IMG_CUSTOM_113_EDITOR                          1019
+#define IMG_CUSTOM_114                                 1020
+#define IMG_CUSTOM_114_EDITOR                          1021
+#define IMG_CUSTOM_115                                 1022
+#define IMG_CUSTOM_115_EDITOR                          1023
+#define IMG_CUSTOM_116                                 1024
+#define IMG_CUSTOM_116_EDITOR                          1025
+#define IMG_CUSTOM_117                                 1026
+#define IMG_CUSTOM_117_EDITOR                          1027
+#define IMG_CUSTOM_118                                 1028
+#define IMG_CUSTOM_118_EDITOR                          1029
+#define IMG_CUSTOM_119                                 1030
+#define IMG_CUSTOM_119_EDITOR                          1031
+#define IMG_CUSTOM_120                                 1032
+#define IMG_CUSTOM_120_EDITOR                          1033
+#define IMG_CUSTOM_121                                 1034
+#define IMG_CUSTOM_121_EDITOR                          1035
+#define IMG_CUSTOM_122                                 1036
+#define IMG_CUSTOM_122_EDITOR                          1037
+#define IMG_CUSTOM_123                                 1038
+#define IMG_CUSTOM_123_EDITOR                          1039
+#define IMG_CUSTOM_124                                 1040
+#define IMG_CUSTOM_124_EDITOR                          1041
+#define IMG_CUSTOM_125                                 1042
+#define IMG_CUSTOM_125_EDITOR                          1043
+#define IMG_CUSTOM_126                                 1044
+#define IMG_CUSTOM_126_EDITOR                          1045
+#define IMG_CUSTOM_127                                 1046
+#define IMG_CUSTOM_127_EDITOR                          1047
+#define IMG_CUSTOM_128                                 1048
+#define IMG_CUSTOM_128_EDITOR                          1049
+#define IMG_CUSTOM_129                                 1050
+#define IMG_CUSTOM_129_EDITOR                          1051
+#define IMG_CUSTOM_130                                 1052
+#define IMG_CUSTOM_130_EDITOR                          1053
+#define IMG_CUSTOM_131                                 1054
+#define IMG_CUSTOM_131_EDITOR                          1055
+#define IMG_CUSTOM_132                                 1056
+#define IMG_CUSTOM_132_EDITOR                          1057
+#define IMG_CUSTOM_133                                 1058
+#define IMG_CUSTOM_133_EDITOR                          1059
+#define IMG_CUSTOM_134                                 1060
+#define IMG_CUSTOM_134_EDITOR                          1061
+#define IMG_CUSTOM_135                                 1062
+#define IMG_CUSTOM_135_EDITOR                          1063
+#define IMG_CUSTOM_136                                 1064
+#define IMG_CUSTOM_136_EDITOR                          1065
+#define IMG_CUSTOM_137                                 1066
+#define IMG_CUSTOM_137_EDITOR                          1067
+#define IMG_CUSTOM_138                                 1068
+#define IMG_CUSTOM_138_EDITOR                          1069
+#define IMG_CUSTOM_139                                 1070
+#define IMG_CUSTOM_139_EDITOR                          1071
+#define IMG_CUSTOM_140                                 1072
+#define IMG_CUSTOM_140_EDITOR                          1073
+#define IMG_CUSTOM_141                                 1074
+#define IMG_CUSTOM_141_EDITOR                          1075
+#define IMG_CUSTOM_142                                 1076
+#define IMG_CUSTOM_142_EDITOR                          1077
+#define IMG_CUSTOM_143                                 1078
+#define IMG_CUSTOM_143_EDITOR                          1079
+#define IMG_CUSTOM_144                                 1080
+#define IMG_CUSTOM_144_EDITOR                          1081
+#define IMG_CUSTOM_145                                 1082
+#define IMG_CUSTOM_145_EDITOR                          1083
+#define IMG_CUSTOM_146                                 1084
+#define IMG_CUSTOM_146_EDITOR                          1085
+#define IMG_CUSTOM_147                                 1086
+#define IMG_CUSTOM_147_EDITOR                          1087
+#define IMG_CUSTOM_148                                 1088
+#define IMG_CUSTOM_148_EDITOR                          1089
+#define IMG_CUSTOM_149                                 1090
+#define IMG_CUSTOM_149_EDITOR                          1091
+#define IMG_CUSTOM_150                                 1092
+#define IMG_CUSTOM_150_EDITOR                          1093
+#define IMG_CUSTOM_151                                 1094
+#define IMG_CUSTOM_151_EDITOR                          1095
+#define IMG_CUSTOM_152                                 1096
+#define IMG_CUSTOM_152_EDITOR                          1097
+#define IMG_CUSTOM_153                                 1098
+#define IMG_CUSTOM_153_EDITOR                          1099
+#define IMG_CUSTOM_154                                 1100
+#define IMG_CUSTOM_154_EDITOR                          1101
+#define IMG_CUSTOM_155                                 1102
+#define IMG_CUSTOM_155_EDITOR                          1103
+#define IMG_CUSTOM_156                                 1104
+#define IMG_CUSTOM_156_EDITOR                          1105
+#define IMG_CUSTOM_157                                 1106
+#define IMG_CUSTOM_157_EDITOR                          1107
+#define IMG_CUSTOM_158                                 1108
+#define IMG_CUSTOM_158_EDITOR                          1109
+#define IMG_CUSTOM_159                                 1110
+#define IMG_CUSTOM_159_EDITOR                          1111
+#define IMG_CUSTOM_160                                 1112
+#define IMG_CUSTOM_160_EDITOR                          1113
+#define IMG_CUSTOM_161                                 1114
+#define IMG_CUSTOM_161_EDITOR                          1115
+#define IMG_CUSTOM_162                                 1116
+#define IMG_CUSTOM_162_EDITOR                          1117
+#define IMG_CUSTOM_163                                 1118
+#define IMG_CUSTOM_163_EDITOR                          1119
+#define IMG_CUSTOM_164                                 1120
+#define IMG_CUSTOM_164_EDITOR                          1121
+#define IMG_CUSTOM_165                                 1122
+#define IMG_CUSTOM_165_EDITOR                          1123
+#define IMG_CUSTOM_166                                 1124
+#define IMG_CUSTOM_166_EDITOR                          1125
+#define IMG_CUSTOM_167                                 1126
+#define IMG_CUSTOM_167_EDITOR                          1127
+#define IMG_CUSTOM_168                                 1128
+#define IMG_CUSTOM_168_EDITOR                          1129
+#define IMG_CUSTOM_169                                 1130
+#define IMG_CUSTOM_169_EDITOR                          1131
+#define IMG_CUSTOM_170                                 1132
+#define IMG_CUSTOM_170_EDITOR                          1133
+#define IMG_CUSTOM_171                                 1134
+#define IMG_CUSTOM_171_EDITOR                          1135
+#define IMG_CUSTOM_172                                 1136
+#define IMG_CUSTOM_172_EDITOR                          1137
+#define IMG_CUSTOM_173                                 1138
+#define IMG_CUSTOM_173_EDITOR                          1139
+#define IMG_CUSTOM_174                                 1140
+#define IMG_CUSTOM_174_EDITOR                          1141
+#define IMG_CUSTOM_175                                 1142
+#define IMG_CUSTOM_175_EDITOR                          1143
+#define IMG_CUSTOM_176                                 1144
+#define IMG_CUSTOM_176_EDITOR                          1145
+#define IMG_CUSTOM_177                                 1146
+#define IMG_CUSTOM_177_EDITOR                          1147
+#define IMG_CUSTOM_178                                 1148
+#define IMG_CUSTOM_178_EDITOR                          1149
+#define IMG_CUSTOM_179                                 1150
+#define IMG_CUSTOM_179_EDITOR                          1151
+#define IMG_CUSTOM_180                                 1152
+#define IMG_CUSTOM_180_EDITOR                          1153
+#define IMG_CUSTOM_181                                 1154
+#define IMG_CUSTOM_181_EDITOR                          1155
+#define IMG_CUSTOM_182                                 1156
+#define IMG_CUSTOM_182_EDITOR                          1157
+#define IMG_CUSTOM_183                                 1158
+#define IMG_CUSTOM_183_EDITOR                          1159
+#define IMG_CUSTOM_184                                 1160
+#define IMG_CUSTOM_184_EDITOR                          1161
+#define IMG_CUSTOM_185                                 1162
+#define IMG_CUSTOM_185_EDITOR                          1163
+#define IMG_CUSTOM_186                                 1164
+#define IMG_CUSTOM_186_EDITOR                          1165
+#define IMG_CUSTOM_187                                 1166
+#define IMG_CUSTOM_187_EDITOR                          1167
+#define IMG_CUSTOM_188                                 1168
+#define IMG_CUSTOM_188_EDITOR                          1169
+#define IMG_CUSTOM_189                                 1170
+#define IMG_CUSTOM_189_EDITOR                          1171
+#define IMG_CUSTOM_190                                 1172
+#define IMG_CUSTOM_190_EDITOR                          1173
+#define IMG_CUSTOM_191                                 1174
+#define IMG_CUSTOM_191_EDITOR                          1175
+#define IMG_CUSTOM_192                                 1176
+#define IMG_CUSTOM_192_EDITOR                          1177
+#define IMG_CUSTOM_193                                 1178
+#define IMG_CUSTOM_193_EDITOR                          1179
+#define IMG_CUSTOM_194                                 1180
+#define IMG_CUSTOM_194_EDITOR                          1181
+#define IMG_CUSTOM_195                                 1182
+#define IMG_CUSTOM_195_EDITOR                          1183
+#define IMG_CUSTOM_196                                 1184
+#define IMG_CUSTOM_196_EDITOR                          1185
+#define IMG_CUSTOM_197                                 1186
+#define IMG_CUSTOM_197_EDITOR                          1187
+#define IMG_CUSTOM_198                                 1188
+#define IMG_CUSTOM_198_EDITOR                          1189
+#define IMG_CUSTOM_199                                 1190
+#define IMG_CUSTOM_199_EDITOR                          1191
+#define IMG_CUSTOM_200                                 1192
+#define IMG_CUSTOM_200_EDITOR                          1193
+#define IMG_CUSTOM_201                                 1194
+#define IMG_CUSTOM_201_EDITOR                          1195
+#define IMG_CUSTOM_202                                 1196
+#define IMG_CUSTOM_202_EDITOR                          1197
+#define IMG_CUSTOM_203                                 1198
+#define IMG_CUSTOM_203_EDITOR                          1199
+#define IMG_CUSTOM_204                                 1200
+#define IMG_CUSTOM_204_EDITOR                          1201
+#define IMG_CUSTOM_205                                 1202
+#define IMG_CUSTOM_205_EDITOR                          1203
+#define IMG_CUSTOM_206                                 1204
+#define IMG_CUSTOM_206_EDITOR                          1205
+#define IMG_CUSTOM_207                                 1206
+#define IMG_CUSTOM_207_EDITOR                          1207
+#define IMG_CUSTOM_208                                 1208
+#define IMG_CUSTOM_208_EDITOR                          1209
+#define IMG_CUSTOM_209                                 1210
+#define IMG_CUSTOM_209_EDITOR                          1211
+#define IMG_CUSTOM_210                                 1212
+#define IMG_CUSTOM_210_EDITOR                          1213
+#define IMG_CUSTOM_211                                 1214
+#define IMG_CUSTOM_211_EDITOR                          1215
+#define IMG_CUSTOM_212                                 1216
+#define IMG_CUSTOM_212_EDITOR                          1217
+#define IMG_CUSTOM_213                                 1218
+#define IMG_CUSTOM_213_EDITOR                          1219
+#define IMG_CUSTOM_214                                 1220
+#define IMG_CUSTOM_214_EDITOR                          1221
+#define IMG_CUSTOM_215                                 1222
+#define IMG_CUSTOM_215_EDITOR                          1223
+#define IMG_CUSTOM_216                                 1224
+#define IMG_CUSTOM_216_EDITOR                          1225
+#define IMG_CUSTOM_217                                 1226
+#define IMG_CUSTOM_217_EDITOR                          1227
+#define IMG_CUSTOM_218                                 1228
+#define IMG_CUSTOM_218_EDITOR                          1229
+#define IMG_CUSTOM_219                                 1230
+#define IMG_CUSTOM_219_EDITOR                          1231
+#define IMG_CUSTOM_220                                 1232
+#define IMG_CUSTOM_220_EDITOR                          1233
+#define IMG_CUSTOM_221                                 1234
+#define IMG_CUSTOM_221_EDITOR                          1235
+#define IMG_CUSTOM_222                                 1236
+#define IMG_CUSTOM_222_EDITOR                          1237
+#define IMG_CUSTOM_223                                 1238
+#define IMG_CUSTOM_223_EDITOR                          1239
+#define IMG_CUSTOM_224                                 1240
+#define IMG_CUSTOM_224_EDITOR                          1241
+#define IMG_CUSTOM_225                                 1242
+#define IMG_CUSTOM_225_EDITOR                          1243
+#define IMG_CUSTOM_226                                 1244
+#define IMG_CUSTOM_226_EDITOR                          1245
+#define IMG_CUSTOM_227                                 1246
+#define IMG_CUSTOM_227_EDITOR                          1247
+#define IMG_CUSTOM_228                                 1248
+#define IMG_CUSTOM_228_EDITOR                          1249
+#define IMG_CUSTOM_229                                 1250
+#define IMG_CUSTOM_229_EDITOR                          1251
+#define IMG_CUSTOM_230                                 1252
+#define IMG_CUSTOM_230_EDITOR                          1253
+#define IMG_CUSTOM_231                                 1254
+#define IMG_CUSTOM_231_EDITOR                          1255
+#define IMG_CUSTOM_232                                 1256
+#define IMG_CUSTOM_232_EDITOR                          1257
+#define IMG_CUSTOM_233                                 1258
+#define IMG_CUSTOM_233_EDITOR                          1259
+#define IMG_CUSTOM_234                                 1260
+#define IMG_CUSTOM_234_EDITOR                          1261
+#define IMG_CUSTOM_235                                 1262
+#define IMG_CUSTOM_235_EDITOR                          1263
+#define IMG_CUSTOM_236                                 1264
+#define IMG_CUSTOM_236_EDITOR                          1265
+#define IMG_CUSTOM_237                                 1266
+#define IMG_CUSTOM_237_EDITOR                          1267
+#define IMG_CUSTOM_238                                 1268
+#define IMG_CUSTOM_238_EDITOR                          1269
+#define IMG_CUSTOM_239                                 1270
+#define IMG_CUSTOM_239_EDITOR                          1271
+#define IMG_CUSTOM_240                                 1272
+#define IMG_CUSTOM_240_EDITOR                          1273
+#define IMG_CUSTOM_241                                 1274
+#define IMG_CUSTOM_241_EDITOR                          1275
+#define IMG_CUSTOM_242                                 1276
+#define IMG_CUSTOM_242_EDITOR                          1277
+#define IMG_CUSTOM_243                                 1278
+#define IMG_CUSTOM_243_EDITOR                          1279
+#define IMG_CUSTOM_244                                 1280
+#define IMG_CUSTOM_244_EDITOR                          1281
+#define IMG_CUSTOM_245                                 1282
+#define IMG_CUSTOM_245_EDITOR                          1283
+#define IMG_CUSTOM_246                                 1284
+#define IMG_CUSTOM_246_EDITOR                          1285
+#define IMG_CUSTOM_247                                 1286
+#define IMG_CUSTOM_247_EDITOR                          1287
+#define IMG_CUSTOM_248                                 1288
+#define IMG_CUSTOM_248_EDITOR                          1289
+#define IMG_CUSTOM_249                                 1290
+#define IMG_CUSTOM_249_EDITOR                          1291
+#define IMG_CUSTOM_250                                 1292
+#define IMG_CUSTOM_250_EDITOR                          1293
+#define IMG_CUSTOM_251                                 1294
+#define IMG_CUSTOM_251_EDITOR                          1295
+#define IMG_CUSTOM_252                                 1296
+#define IMG_CUSTOM_252_EDITOR                          1297
+#define IMG_CUSTOM_253                                 1298
+#define IMG_CUSTOM_253_EDITOR                          1299
+#define IMG_CUSTOM_254                                 1300
+#define IMG_CUSTOM_254_EDITOR                          1301
+#define IMG_CUSTOM_255                                 1302
+#define IMG_CUSTOM_255_EDITOR                          1303
+#define IMG_CUSTOM_256                                 1304
+#define IMG_CUSTOM_256_EDITOR                          1305
+#define IMG_GROUP_1                                    1306
+#define IMG_GROUP_1_EDITOR                             1307
+#define IMG_GROUP_2                                    1308
+#define IMG_GROUP_2_EDITOR                             1309
+#define IMG_GROUP_3                                    1310
+#define IMG_GROUP_3_EDITOR                             1311
+#define IMG_GROUP_4                                    1312
+#define IMG_GROUP_4_EDITOR                             1313
+#define IMG_GROUP_5                                    1314
+#define IMG_GROUP_5_EDITOR                             1315
+#define IMG_GROUP_6                                    1316
+#define IMG_GROUP_6_EDITOR                             1317
+#define IMG_GROUP_7                                    1318
+#define IMG_GROUP_7_EDITOR                             1319
+#define IMG_GROUP_8                                    1320
+#define IMG_GROUP_8_EDITOR                             1321
+#define IMG_GROUP_9                                    1322
+#define IMG_GROUP_9_EDITOR                             1323
+#define IMG_GROUP_10                                   1324
+#define IMG_GROUP_10_EDITOR                            1325
+#define IMG_GROUP_11                                   1326
+#define IMG_GROUP_11_EDITOR                            1327
+#define IMG_GROUP_12                                   1328
+#define IMG_GROUP_12_EDITOR                            1329
+#define IMG_GROUP_13                                   1330
+#define IMG_GROUP_13_EDITOR                            1331
+#define IMG_GROUP_14                                   1332
+#define IMG_GROUP_14_EDITOR                            1333
+#define IMG_GROUP_15                                   1334
+#define IMG_GROUP_15_EDITOR                            1335
+#define IMG_GROUP_16                                   1336
+#define IMG_GROUP_16_EDITOR                            1337
+#define IMG_GROUP_17                                   1338
+#define IMG_GROUP_17_EDITOR                            1339
+#define IMG_GROUP_18                                   1340
+#define IMG_GROUP_18_EDITOR                            1341
+#define IMG_GROUP_19                                   1342
+#define IMG_GROUP_19_EDITOR                            1343
+#define IMG_GROUP_20                                   1344
+#define IMG_GROUP_20_EDITOR                            1345
+#define IMG_GROUP_21                                   1346
+#define IMG_GROUP_21_EDITOR                            1347
+#define IMG_GROUP_22                                   1348
+#define IMG_GROUP_22_EDITOR                            1349
+#define IMG_GROUP_23                                   1350
+#define IMG_GROUP_23_EDITOR                            1351
+#define IMG_GROUP_24                                   1352
+#define IMG_GROUP_24_EDITOR                            1353
+#define IMG_GROUP_25                                   1354
+#define IMG_GROUP_25_EDITOR                            1355
+#define IMG_GROUP_26                                   1356
+#define IMG_GROUP_26_EDITOR                            1357
+#define IMG_GROUP_27                                   1358
+#define IMG_GROUP_27_EDITOR                            1359
+#define IMG_GROUP_28                                   1360
+#define IMG_GROUP_28_EDITOR                            1361
+#define IMG_GROUP_29                                   1362
+#define IMG_GROUP_29_EDITOR                            1363
+#define IMG_GROUP_30                                   1364
+#define IMG_GROUP_30_EDITOR                            1365
+#define IMG_GROUP_31                                   1366
+#define IMG_GROUP_31_EDITOR                            1367
+#define IMG_GROUP_32                                   1368
+#define IMG_GROUP_32_EDITOR                            1369
+#define IMG_EMC_OBJECT                                 1370
+#define IMG_EMC_SPRITE                                 1371
+#define IMG_TOON_1                                     1372
+#define IMG_TOON_2                                     1373
+#define IMG_TOON_3                                     1374
+#define IMG_TOON_4                                     1375
+#define IMG_TOON_5                                     1376
+#define IMG_TOON_6                                     1377
+#define IMG_TOON_7                                     1378
+#define IMG_TOON_8                                     1379
+#define IMG_TOON_9                                     1380
+#define IMG_TOON_10                                    1381
+#define IMG_TOON_11                                    1382
+#define IMG_TOON_12                                    1383
+#define IMG_TOON_13                                    1384
+#define IMG_TOON_14                                    1385
+#define IMG_TOON_15                                    1386
+#define IMG_TOON_16                                    1387
+#define IMG_TOON_17                                    1388
+#define IMG_TOON_18                                    1389
+#define IMG_TOON_19                                    1390
+#define IMG_TOON_20                                    1391
+#define IMG_MENU_CALIBRATE_RED                         1392
+#define IMG_MENU_CALIBRATE_BLUE                                1393
+#define IMG_MENU_CALIBRATE_YELLOW                      1394
+#define IMG_MENU_BUTTON                                        1395
+#define IMG_MENU_BUTTON_ACTIVE                         1396
+#define IMG_MENU_BUTTON_LEFT                           1397
+#define IMG_MENU_BUTTON_RIGHT                          1398
+#define IMG_MENU_BUTTON_UP                             1399
+#define IMG_MENU_BUTTON_DOWN                           1400
+#define IMG_MENU_BUTTON_LEFT_ACTIVE                    1401
+#define IMG_MENU_BUTTON_RIGHT_ACTIVE                   1402
+#define IMG_MENU_BUTTON_UP_ACTIVE                      1403
+#define IMG_MENU_BUTTON_DOWN_ACTIVE                    1404
+#define IMG_MENU_SCROLLBAR                             1405
+#define IMG_MENU_SCROLLBAR_ACTIVE                      1406
+#define IMG_FONT_INITIAL_1                             1407
+#define IMG_FONT_INITIAL_2                             1408
+#define IMG_FONT_INITIAL_3                             1409
+#define IMG_FONT_INITIAL_4                             1410
+#define IMG_FONT_TITLE_1                               1411
+#define IMG_FONT_TITLE_1_LEVELS                                1412
+#define IMG_FONT_TITLE_2                               1413
+#define IMG_FONT_MENU_1                                        1414
+#define IMG_FONT_MENU_2                                        1415
+#define IMG_FONT_TEXT_1                                        1416
+#define IMG_FONT_TEXT_1_LEVELS                         1417
+#define IMG_FONT_TEXT_1_PREVIEW                                1418
+#define IMG_FONT_TEXT_1_SCORES                         1419
+#define IMG_FONT_TEXT_1_ACTIVE_SCORES                  1420
+#define IMG_FONT_TEXT_2                                        1421
+#define IMG_FONT_TEXT_2_LEVELS                         1422
+#define IMG_FONT_TEXT_2_PREVIEW                                1423
+#define IMG_FONT_TEXT_2_SCORES                         1424
+#define IMG_FONT_TEXT_2_ACTIVE_SCORES                  1425
+#define IMG_FONT_TEXT_3                                        1426
+#define IMG_FONT_TEXT_3_LEVELS                         1427
+#define IMG_FONT_TEXT_3_PREVIEW                                1428
+#define IMG_FONT_TEXT_3_SCORES                         1429
+#define IMG_FONT_TEXT_3_ACTIVE_SCORES                  1430
+#define IMG_FONT_TEXT_4                                        1431
+#define IMG_FONT_TEXT_4_LEVELS                         1432
+#define IMG_FONT_TEXT_4_SCORES                         1433
+#define IMG_FONT_TEXT_4_ACTIVE_SCORES                  1434
+#define IMG_FONT_ENVELOPE_1                            1435
+#define IMG_FONT_ENVELOPE_2                            1436
+#define IMG_FONT_ENVELOPE_3                            1437
+#define IMG_FONT_ENVELOPE_4                            1438
+#define IMG_FONT_INPUT_1                               1439
+#define IMG_FONT_INPUT_1_MAIN                          1440
+#define IMG_FONT_INPUT_1_ACTIVE                                1441
+#define IMG_FONT_INPUT_1_ACTIVE_MAIN                   1442
+#define IMG_FONT_INPUT_1_ACTIVE_SETUP                  1443
+#define IMG_FONT_INPUT_2                               1444
+#define IMG_FONT_INPUT_2_ACTIVE                                1445
+#define IMG_FONT_OPTION_OFF                            1446
+#define IMG_FONT_OPTION_ON                             1447
+#define IMG_FONT_VALUE_1                               1448
+#define IMG_FONT_VALUE_2                               1449
+#define IMG_FONT_VALUE_OLD                             1450
+#define IMG_FONT_LEVEL_NUMBER                          1451
+#define IMG_FONT_TAPE_RECORDER                         1452
+#define IMG_FONT_GAME_INFO                             1453
+#define IMG_GLOBAL_BORDER                              1454
+#define IMG_GLOBAL_DOOR                                        1455
+#define IMG_EDITOR_ELEMENT_BORDER                      1456
+#define IMG_EDITOR_ELEMENT_BORDER_INPUT                        1457
+#define IMG_BACKGROUND_ENVELOPE_1                      1458
+#define IMG_BACKGROUND_ENVELOPE_2                      1459
+#define IMG_BACKGROUND_ENVELOPE_3                      1460
+#define IMG_BACKGROUND_ENVELOPE_4                      1461
+#define IMG_BACKGROUND                                 1462
+#define IMG_BACKGROUND_MAIN                            1463
+#define IMG_BACKGROUND_LEVELS                          1464
+#define IMG_BACKGROUND_SCORES                          1465
+#define IMG_BACKGROUND_EDITOR                          1466
+#define IMG_BACKGROUND_INFO                            1467
+#define IMG_BACKGROUND_INFO_ELEMENTS                   1468
+#define IMG_BACKGROUND_SETUP                           1469
+#define IMG_BACKGROUND_DOOR                            1470
 
-#define NUM_IMAGE_FILES                                        1470
+#define NUM_IMAGE_FILES                                        1471
 
 #endif /* CONF_GFX_H */
index 79513610d532db7ef6425aadd7df30e0076e49cd..95a65b29bcdd5f94a480eac9051adffce8ad8b1b 100644 (file)
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-01-17 01:28]"
+#define COMPILE_DATE_STRING "[2005-01-22 17:10]"
index 6a86b6ba9a7e3820828525e01e17a1869db64dc9..6a467021f6a7a463baf46034c600f6a17690f293 100644 (file)
@@ -1118,6 +1118,8 @@ void DrawAllGameValues(int emeralds, int dynamite, int score, int time,
   for (i = 0; i < MAX_KEYS; i++)
     key[i] = key_bits & (1 << i);
 
+  DrawGameValue_Level(level_nr);
+
   DrawGameValue_Emeralds(emeralds);
   DrawGameValue_Dynamite(dynamite);
   DrawGameValue_Score(score);
index 9e253dad12e75f8755a7f16376d9e9b944e32096..c40eed93dee9583f264b5c6f6bfe94d9fb18ad5d 100644 (file)
@@ -17,66 +17,75 @@ static unsigned char remap_v6[256] =
 {
   /* filter crap for v6 */
 
-  0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15,
-  16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28,
-  0,16,2,18,36,37,37,37,40,41,42,43,44,45,128,128,
-  128,148,148,148,45,45,45,148,0,57,58,59,60,61,62,63,
-  64,65,66,67,68,69,69,69,69,73,74,75,118,75,75,75,
-  75,75,75,75,75,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,99,100,68,68,68,68,68,68,68,68,118,118,118,
-  118,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,165,118,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,68,191,
-  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,153,153,153,153,153,153,153,153,153,153
+  0,0,2,2,         4,4,118,118,     8,9,10,11,       12,13,14,15,
+  16,16,18,18,     20,21,22,23,     24,25,26,27,     28,28,118,28,
+  0,16,2,18,       36,37,37,37,     40,41,42,43,     44,45,128,128,
+  128,148,148,     148,45,45,45,    148,0,57,58,     59,60,61,62,63,
+
+  64,65,66,67,     68,69,69,69,     69,73,74,75,     118,75,75,75,
+  75,75,75,75,     75,153,153,153,  153,153,153,153, 153,153,153,153,
+  153,153,153,99,  100,68,68,68,    68,68,68,68,     68,118,118,118,
+  118,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118,
+
+  128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+  144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
+  160,161,162,163, 164,165,165,118, 168,169,170,171, 172,173,174,175,
+  176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,68,191,
+
+  192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
+  208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+  224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+  240,241,242,243, 244,245,153,153, 153,153,153,153, 153,153,153,153
 };
 
 static unsigned char remap_v5[256] =
 {
   /* filter crap for v5 */
 
-  0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15,
-  16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28,
-  0,16,2,18,36,37,37,37,147,41,42,43,44,45,128,128,
-  128,148,148,148,45,45,45,148,0,57,58,59,60,61,62,63,
-  64,65,66,67,68,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,68,68,68,68,68,68,68,68,118,118,118,
-  118,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,153,153,153,153,153,153,118,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,68,153,
-  153,153,153,153,153,153,153,153,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,153,153,153,153,153,153,153,153,153,153,153,153,153,153
+  0,0,2,2,         4,4,118,118,     8,9,10,11,       12,13,14,15,
+  16,16,18,18,     20,21,22,23,     24,25,26,27,     28,28,118,28,
+  0,16,2,18,       36,37,37,37,     147,41,42,43,    44,45,128,128,
+  128,148,148,148, 45,45,45,148,    0,57,58,59,      60,61,62,63,
+
+  64,65,66,67,     68,153,153,153,  153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,68,68,68,68, 68,68,68,68,118, 118,118,
+  118,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118,
+
+  128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+  144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
+  160,153,153,153, 153,153,153,118, 168,169,170,171, 172,173,174,175,
+  176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,68,153,
+
+  153,153,153,153, 153,153,153,153, 200,201,202,203, 204,205,206,207,
+  208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+  224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+  240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153
 };
 
 static unsigned char remap_v4[256] =
 {
   /* filter crap for v4 */
 
-  0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15,
-  16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28,
-  0,16,2,18,36,37,37,37,147,41,42,43,44,45,128,128,
-  128,148,148,148,45,45,45,148,0,153,153,59,60,61,62,63,
-  64,65,66,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,68,154,155,156,157,158,160,
-  160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,175,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,68,153,
-  153,153,153,153,153,153,153,153,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,153,153,153,153,153,153,153,153,153,153,153,153,153,153
+  0,0,2,2,         4,4,118,118,     8,9,10,11,       12,13,14,15,
+  16,16,18,18,     20,21,22,23,     24,25,26,27,     28,28,118,28,
+  0,16,2,18,       36,37,37,37,     147,41,42,43,    44,45,128,128,
+  128,148,148,148, 45,45,45,148,    0,153,153,59,    60,61,62,63,
+
+  64,65,66,153,    153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118,
+
+  128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+  144,145,146,147, 148,149,150,151, 152,68,154,155,  156,157,158,160,
+  160,160,160,160, 160,160,160,160, 160,160,160,160, 160,160,160,175,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,68,153,
+
+  153,153,153,153, 153,153,153,153, 200,201,202,203, 204,205,206,207,
+  208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+  224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+  240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153
 };
 
 static unsigned char remap_v4eater[28] =
@@ -193,10 +202,27 @@ int cleanup_em_level(unsigned char *src, int length)
     if (src[i] == 40)
       src[i] = 147;
 
+#if 0
   /* fix acid */
   for (i = 64; i < 2048; i++)
+    if (src[i] == 63)          /* replace element above 'Xacid_s' ... */
+      src[i - 64] = 101;       /* ... with 'Xacid_1' */
+
+#else
+
+  /* fix acid */
+  for (i = 64; i < 2048; i++)
+  {
     if (src[i] == 63)
-      src[i - 64] = 101;
+    {
+      if (file_version == FILE_VERSION_EM_V4 &&
+         i < 2048 - 64 && src[i + 64] == 63)
+       src[i - 64] = 255;
+      else
+       src[i - 64] = 101;
+    }
+  }
+#endif
 
   /* fix acid in eater 1 */
   for (i = 2051; i < 2057; i++)
@@ -326,6 +352,10 @@ int cleanup_em_level(unsigned char *src, int length)
   /* size of v6 cave */
   length = 2172;
 
+#if 0
+  printf("::: EM level file version: %d\n", file_version);
+#endif
+
   return file_version;
 }
 
@@ -346,7 +376,8 @@ int cleanup_em_level(unsigned char *src, int length)
  *   rolls.
  * - a compile time option for rolling objects (stone, nut, spring, bomb) only
  *   in eater.
- * - acid is always deadly even with no base beneath it.
+ * - acid is always deadly even with no base beneath it (this breaks cave 0 in
+ *   downunder mine 16)
  *
  * so far all below have not broken any caves:
  *
@@ -379,51 +410,106 @@ int cleanup_em_level(unsigned char *src, int length)
 
 static unsigned short remap_emerald[256] =
 {
-  Xstone, Xstone, Xdiamond, Xdiamond, Xalien, Xalien, Xblank, Xblank,
-  Xtank_n, Xtank_e, Xtank_s, Xtank_w, Xtank_gon, Xtank_goe, Xtank_gos, Xtank_gow,
-  Xbomb, Xbomb, Xemerald, Xemerald, Xbug_n, Xbug_e, Xbug_s, Xbug_w,
-  Xbug_gon, Xbug_goe, Xbug_gos, Xbug_gow, Xdrip_eat, Xdrip_eat, Xdrip_eat, Xdrip_eat,
-  Xstone, Xbomb, Xdiamond, Xemerald, Xwonderwall, Xnut, Xnut, Xnut,
-  Xwheel, Xeater_n, Xeater_s, Xeater_w, Xeater_e, Xsand_stone, Xblank, Xblank,
-  Xblank, Xsand, Xsand, Xsand, Xsand_stone, Xsand_stone, Xsand_stone, Xsand,
-  Xstone, Xgrow_ew, Xgrow_ns, Xdynamite_1, Xdynamite_2, Xdynamite_3, Xdynamite_4, Xacid_s,
-  Xexit_1, Xexit_2, Xexit_3, Xballoon, Xplant, Xspring, Xspring, Xspring,
-  Xspring, Xball_1, Xball_2, Xandroid, Xblank, Xandroid, Xandroid, Xandroid,
-  Xandroid, Xandroid, Xandroid, Xandroid, Xandroid, Xblank, Xblank, Xblank,
-  Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xstone,              Xstone,         Xdiamond,       Xdiamond,
+  Xalien,              Xalien,         Xblank,         Xblank,
+  Xtank_n,             Xtank_e,        Xtank_s,        Xtank_w,
+  Xtank_gon,           Xtank_goe,      Xtank_gos,      Xtank_gow,
+
+  Xbomb,               Xbomb,          Xemerald,       Xemerald,
+  Xbug_n,              Xbug_e,         Xbug_s,         Xbug_w,
+  Xbug_gon,            Xbug_goe,       Xbug_gos,       Xbug_gow,
+  Xdrip_eat,           Xdrip_eat,      Xdrip_eat,      Xdrip_eat,
+
+  Xstone,              Xbomb,          Xdiamond,       Xemerald,
+  Xwonderwall,         Xnut,           Xnut,           Xnut,
+  Xwheel,              Xeater_n,       Xeater_s,       Xeater_w,
+  Xeater_e,            Xsand_stone,    Xblank,         Xblank,
+
+  Xblank,              Xsand,          Xsand,          Xsand,
+  Xsand_stone,         Xsand_stone,    Xsand_stone,    Xsand,
+  Xstone,              Xgrow_ew,       Xgrow_ns,       Xdynamite_1,
+  Xdynamite_2,         Xdynamite_3,    Xdynamite_4,    Xacid_s,
+
+  Xexit_1,             Xexit_2,        Xexit_3,        Xballoon,
+  Xplant,              Xspring,        Xspring,        Xspring,
+  Xspring,             Xball_1,        Xball_2,        Xandroid,
+  Xblank,              Xandroid,       Xandroid,       Xandroid,
+
+  Xandroid,            Xandroid,       Xandroid,       Xandroid,
+  Xandroid,            Xblank,         Xblank,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
 
 #ifdef BAD_ROLL
 
-  Xblank, Xblank, Xblank, Xspring_force_w, Xspring_force_e, Xacid_1, Xacid_2, Xacid_3,
-  Xacid_4, Xacid_5, Xacid_6, Xacid_7, Xacid_8, Xblank, Xblank, Xblank,
-  Xblank, Xblank, Xnut_force_w, Xnut_force_e, Xsteel_1, Xblank, Xblank, Xbomb_force_w,
-  Xbomb_force_e, Xstone_force_w, Xstone_force_e, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xblank,              Xblank,         Xblank,         Xspring_force_w,
+  Xspring_force_e,     Xacid_1,        Xacid_2,        Xacid_3,
+  Xacid_4,             Xacid_5,        Xacid_6,        Xacid_7,
+  Xacid_8,             Xblank,         Xblank,         Xblank,
+
+  Xblank,              Xblank,         Xnut_force_w,   Xnut_force_e,
+  Xsteel_1,            Xblank,         Xblank,         Xbomb_force_w,
+  Xbomb_force_e,       Xstone_force_w, Xstone_force_e, Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
 
 #else
 
-  Xblank, Xblank, Xblank, Xspring, Xspring, Xacid_1, Xacid_2, Xacid_3,
-  Xacid_4, Xacid_5, Xacid_6, Xacid_7, Xacid_8, Xblank, Xblank, Xblank,
-  Xblank, Xblank, Xnut, Xnut, Xsteel_1, Xblank, Xblank, Xbomb,
-  Xbomb, Xstone, Xstone, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xblank,              Xblank,         Xblank,         Xspring,
+  Xspring,             Xacid_1,        Xacid_2,        Xacid_3,
+  Xacid_4,             Xacid_5,        Xacid_6,        Xacid_7,
+  Xacid_8,             Xblank,         Xblank,         Xblank,
+
+  Xblank,              Xblank,         Xnut,           Xnut,
+  Xsteel_1,            Xblank,         Xblank,         Xbomb,
+  Xbomb,               Xstone,         Xstone,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
 
 #endif
 
-  Xblank, Xround_wall_1, Xgrass, Xsteel_1, Xwall_1, Xkey_1, Xkey_2, Xkey_3,
-  Xkey_4, Xdoor_1, Xdoor_2, Xdoor_3, Xdoor_4, Xdripper, Xfake_door_1, Xfake_door_2,
-  Xfake_door_3, Xfake_door_4, Xwonderwall, Xwheel, Xsand, Xacid_nw, Xacid_ne, Xacid_sw,
-  Xacid_se, Xfake_blank, Xamoeba_1, Xamoeba_2, Xamoeba_3, Xamoeba_4, Xexit, Xalpha_arrow_w,
-  Xfake_grass, Xlenses, Xmagnify, Xfake_blank, Xfake_grass, Xswitch, Xswitch, Xblank,
-  Xdecor_8, Xdecor_9, Xdecor_10, Xdecor_5, Xalpha_comma, Xalpha_quote, Xalpha_minus, Xdynamite,
-  Xsteel_3, Xdecor_6, Xdecor_7, Xsteel_2, Xround_wall_2, Xdecor_2, Xdecor_4, Xdecor_3,
-  Xwind_nesw, Xwind_e, Xwind_s, Xwind_w, Xwind_n, Xdirt, Xplant, Xkey_5,
-  Xkey_6, Xkey_7, Xkey_8, Xdoor_5, Xdoor_6, Xdoor_7, Xdoor_8, Xbumper,
-  Xalpha_a, Xalpha_b, Xalpha_c, Xalpha_d, Xalpha_e, Xalpha_f, Xalpha_g, Xalpha_h,
-  Xalpha_i, Xalpha_j, Xalpha_k, Xalpha_l, Xalpha_m, Xalpha_n, Xalpha_o, Xalpha_p,
-  Xalpha_q, Xalpha_r, Xalpha_s, Xalpha_t, Xalpha_u, Xalpha_v, Xalpha_w, Xalpha_x,
-  Xalpha_y, Xalpha_z, Xalpha_0, Xalpha_1, Xalpha_2, Xalpha_3, Xalpha_4, Xalpha_5,
-  Xalpha_6, Xalpha_7, Xalpha_8, Xalpha_9, Xalpha_perio, Xalpha_excla, Xalpha_colon, Xalpha_quest,
-  Xalpha_arrow_e, Xdecor_1, Xfake_door_5, Xfake_door_6, Xfake_door_7, Xfake_door_8, Xblank, Xblank,
-  Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xblank,              Xround_wall_1,  Xgrass,         Xsteel_1,
+  Xwall_1,             Xkey_1,         Xkey_2,         Xkey_3,
+  Xkey_4,              Xdoor_1,        Xdoor_2,        Xdoor_3,
+  Xdoor_4,             Xdripper,       Xfake_door_1,   Xfake_door_2,
+
+  Xfake_door_3,                Xfake_door_4,   Xwonderwall,    Xwheel,
+  Xsand,               Xacid_nw,       Xacid_ne,       Xacid_sw,
+  Xacid_se,            Xfake_blank,    Xamoeba_1,      Xamoeba_2,
+  Xamoeba_3,           Xamoeba_4,      Xexit,          Xalpha_arrow_w,
+
+  Xfake_grass,         Xlenses,        Xmagnify,       Xfake_blank,
+  Xfake_grass,         Xswitch,        Xswitch,        Xblank,
+  Xdecor_8,            Xdecor_9,       Xdecor_10,      Xdecor_5,
+  Xalpha_comma,                Xalpha_quote,   Xalpha_minus,   Xdynamite,
+
+  Xsteel_3,            Xdecor_6,       Xdecor_7,       Xsteel_2,
+  Xround_wall_2,       Xdecor_2,       Xdecor_4,       Xdecor_3,
+  Xwind_nesw,          Xwind_e,        Xwind_s,        Xwind_w,
+  Xwind_n,             Xdirt,          Xplant,         Xkey_5,
+
+  Xkey_6,              Xkey_7,         Xkey_8,         Xdoor_5,
+  Xdoor_6,             Xdoor_7,        Xdoor_8,        Xbumper,
+  Xalpha_a,            Xalpha_b,       Xalpha_c,       Xalpha_d,
+  Xalpha_e,            Xalpha_f,       Xalpha_g,       Xalpha_h,
+
+  Xalpha_i,            Xalpha_j,       Xalpha_k,       Xalpha_l,
+  Xalpha_m,            Xalpha_n,       Xalpha_o,       Xalpha_p,
+  Xalpha_q,            Xalpha_r,       Xalpha_s,       Xalpha_t,
+  Xalpha_u,            Xalpha_v,       Xalpha_w,       Xalpha_x,
+
+  Xalpha_y,            Xalpha_z,       Xalpha_0,       Xalpha_1,
+  Xalpha_2,            Xalpha_3,       Xalpha_4,       Xalpha_5,
+  Xalpha_6,            Xalpha_7,       Xalpha_8,       Xalpha_9,
+  Xalpha_perio,                Xalpha_excla,   Xalpha_colon,   Xalpha_quest,
+
+  Xalpha_arrow_e,      Xdecor_1,       Xfake_door_5,   Xfake_door_6,
+  Xfake_door_7,                Xfake_door_8,   Xblank,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
+#if 0
+  Xblank,              Xblank,         Xblank,         Xblank,
+#else
+  /* special elements added to solve compatibility problems */
+  Xblank,              Xblank,         Xblank,         Xfake_acid_1
+#endif
 };
 
 void convert_em_level(unsigned char *src, int file_version)
index 78fbe8b007ef3029590525283853cb664b8ce0e3..93100cb306d5aacbc398dc6c56fed92da7fcf379 100644 (file)
@@ -81,25 +81,27 @@ static void DrawLevelField_EM(int x, int y, int sx, int sy,
   int src_y = g->src_y + g->src_offset_y;
   int dst_x = sx * TILEX + g->dst_offset_x;
   int dst_y = sy * TILEY + g->dst_offset_y;
+  int width = g->width;
+  int height = g->height;
 
   if (draw_masked)
   {
-    if (g->width > 0 && g->height > 0)
+    if (width > 0 && height > 0)
     {
       SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
                    dst_x - src_x, dst_y - src_y);
       BlitBitmapMasked(g->bitmap, screenBitmap,
-                      src_x, src_y, g->width, g->height, dst_x, dst_y);
+                      src_x, src_y, width, height, dst_x, dst_y);
     }
   }
   else
   {
-    if (g->width != TILEX || g->height != TILEY)
+    if (width != TILEX || height != TILEY)
       ClearRectangle(screenBitmap, sx * TILEX, sy * TILEY, TILEX, TILEY);
 
-    if (g->width > 0 && g->height > 0)
+    if (width > 0 && height > 0)
       BlitBitmap(g->bitmap, screenBitmap,
-                src_x, src_y, g->width, g->height, dst_x, dst_y);
+                src_x, src_y, width, height, dst_x, dst_y);
   }
 }
 
@@ -263,6 +265,7 @@ static void animscreen(void)
        }
       }
 
+      /* only redraw screen tiles if they (or their crumbled state) changed */
       if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm)
       {
        DrawLevelField_EM(x, y, sx, sy, FALSE);
@@ -308,11 +311,13 @@ static void blitplayer(struct PLAYER *ply)
     int old_sy = old_y % MAX_BUF_XSIZE;
     int new_sx = new_x % MAX_BUF_XSIZE;
     int new_sy = new_y % MAX_BUF_XSIZE;
+#if 0
     int old_crm = crumbled_state[old_sy][old_sx];
+#endif
     int new_crm = crumbled_state[new_sy][new_sx];
 
     /* only diggable elements can be crumbled in the classic EM engine */
-    boolean player_is_digging = (crumbled_state[new_sy][new_sx] != 0);
+    boolean player_is_digging = (new_crm != 0);
 
     x1 %= MAX_BUF_XSIZE * TILEX;
     y1 %= MAX_BUF_YSIZE * TILEY;
@@ -321,9 +326,11 @@ static void blitplayer(struct PLAYER *ply)
 
     if (player_is_digging)
     {
+#if 0
       /* draw the field the player is moving from (under the player) */
       DrawLevelField_EM(old_x, old_y, old_sx, old_sy, FALSE);
       DrawLevelFieldCrumbled_EM(old_x, old_y, old_sx, old_sy, old_crm, FALSE);
+#endif
 
       /* draw the field the player is moving to (under the player) */
       DrawLevelField_EM(new_x, new_y, new_sx, new_sy, FALSE);
@@ -331,6 +338,11 @@ static void blitplayer(struct PLAYER *ply)
 
       /* draw the player (masked) over the element he is just digging away */
       DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, TRUE);
+
+#if 1
+      /* draw the field the player is moving from (masked over the player) */
+      DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE);
+#endif
     }
     else
     {
index 4523a2181c534e3526c008fef26f76f74d913619..a34f10fdf95e6c7d7ccb56bbc92881bb9d5e9749 100644 (file)
@@ -362,6 +362,18 @@ enum
   Xfake_door_6,
   Xfake_door_7,
   Xfake_door_8,
+
+#if 1
+  Xfake_acid_1,
+  Xfake_acid_2,
+  Xfake_acid_3,
+  Xfake_acid_4,
+  Xfake_acid_5,
+  Xfake_acid_6,
+  Xfake_acid_7,
+  Xfake_acid_8,
+#endif
+
   Xsteel_1,
   Xsteel_2,
   Xsteel_3,
index 3f7643fba41f2c28851dd27673c0c0d8a5c30293..5107c0ffa300d4338261399931b0f8a1cc7ced92 100644 (file)
 #include "display.h"
 
 
-static void player(struct PLAYER *);
+static void check_player(struct PLAYER *);
+static void kill_player(struct PLAYER *);
 static boolean player_digfield(struct PLAYER *, int, int);
-static int test(struct PLAYER *);
-static void die(struct PLAYER *);
+static boolean player_killed(struct PLAYER *);
 
 void synchro_1(void)
 {
  /* must test for death and actually kill separately */
-  char ply1_kill = test(&ply1);
-  char ply2_kill = test(&ply2);
+  boolean ply1_kill = player_killed(&ply1);
+  boolean ply2_kill = player_killed(&ply2);
 
   if (ply1.alive && ply1_kill)
-    die(&ply1);
+    kill_player(&ply1);
   if (ply2.alive && ply2_kill)
-    die(&ply2);
+    kill_player(&ply2);
 
 #if 0
   ply1.alive = 1; /* debugging */
@@ -40,13 +40,13 @@ void synchro_1(void)
 
   if (Random & 256)
   {
-    if (ply1.alive) player(&ply1);
-    if (ply2.alive) player(&ply2);
+    if (ply1.alive) check_player(&ply1);
+    if (ply2.alive) check_player(&ply2);
   }
   else
   {
-    if (ply2.alive) player(&ply2);
-    if (ply1.alive) player(&ply1);
+    if (ply2.alive) check_player(&ply2);
+    if (ply1.alive) check_player(&ply1);
   }
 
   if (ply1.alive)
@@ -80,16 +80,16 @@ void synchro_1(void)
   }
 }
 
-static int test(struct PLAYER *ply)
+static boolean player_killed(struct PLAYER *ply)
 {
   register unsigned int x = ply->x;
   register unsigned int y = ply->y;
 
   if (!ply->alive)
-    return 0;
+    return FALSE;
 
   if (lev.time_initial > 0 && lev.time == 0)
-    return 1;
+    return TRUE;
 
   switch(Cave[y-1][x])
   {
@@ -109,7 +109,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y][x+1])
@@ -130,7 +130,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y+1][x])
@@ -151,7 +151,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y][x-1])
@@ -172,7 +172,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y][x])
@@ -185,13 +185,23 @@ static int test(struct PLAYER *ply)
     case Xdynamite_2:
     case Xdynamite_3:
     case Xdynamite_4:
-      return 0;
+#if 1
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
+#endif
+      return FALSE;
   }
 
-  return 1;
+  return TRUE;
 }
 
-static void die(struct PLAYER *ply)
+static void kill_player(struct PLAYER *ply)
 {
   register unsigned int x = ply->x;
   register unsigned int y = ply->y;
@@ -335,11 +345,28 @@ static void die(struct PLAYER *ply)
       break;
   }
 
-  Cave[y][x] = Xboom_1;
-  Boom[y][x] = Xblank;
+  switch(Cave[y][x])
+  {
+#if 1
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      break;
+#endif
+
+    default:
+      Cave[y][x] = Xboom_1;
+      Boom[y][x] = Xblank;
+      break;
+  }
 }
 
-static void player(struct PLAYER *ply)
+static void check_player(struct PLAYER *ply)
 {
   unsigned int oldx = ply->x;
   unsigned int oldy = ply->y;
@@ -523,12 +550,38 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Yacid_splash_wB:
        Cave[y][x] = Zplayer;
        Next[y][x] = Zplayer;
+#if 1
+      case Xfake_acid_1:
+      case Xfake_acid_2:
+      case Xfake_acid_3:
+      case Xfake_acid_4:
+      case Xfake_acid_5:
+      case Xfake_acid_6:
+      case Xfake_acid_7:
+      case Xfake_acid_8:
+#endif
        play_element_sound(x, y, SAMPLE_blank, Xblank);
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
        break;
 
+#if 1
+      case Xacid_1:
+      case Xacid_2:
+      case Xacid_3:
+      case Xacid_4:
+      case Xacid_5:
+      case Xacid_6:
+      case Xacid_7:
+      case Xacid_8:
+#endif
+       if (Cave[y-1][x+1] == Xblank)
+         Cave[y-1][x+1] = Yacid_splash_eB;
+       if (Cave[y-1][x-1] == Xblank)
+         Cave[y-1][x-1] = Yacid_splash_wB;
+       play_sound(x, y, SAMPLE_acid);
+
       case Xboom_android:
       case Xboom_1:
       case Xbug_n:
@@ -547,6 +600,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xtank_goe:
       case Xtank_gos:
       case Xtank_gow:
+#if 0
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -555,6 +609,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xacid_6:
       case Xacid_7:
       case Xacid_8:
+#endif
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
index 662ad2e53630f521ee873bf3be648d9c682c0419..348cd72bf3edb17fa4b974709807e74b49215a69 100644 (file)
@@ -356,6 +356,16 @@ void synchro_2(void)
        case Yacid_splash_wB:
        case Xplant:
        case Yplant:
+#if 1
+        case Xfake_acid_1:
+        case Xfake_acid_2:
+        case Xfake_acid_3:
+        case Xfake_acid_4:
+        case Xfake_acid_5:
+        case Xfake_acid_6:
+        case Xfake_acid_7:
+        case Xfake_acid_8:
+#endif
          Cave[y][x] = Ystone_sB;
          Cave[y+1][x] = Ystone_s;
          Next[y][x] = Xblank;
@@ -485,6 +495,16 @@ void synchro_2(void)
        case Xblank:
        case Yacid_splash_eB:
        case Yacid_splash_wB:
+#if 1
+        case Xfake_acid_1:
+        case Xfake_acid_2:
+        case Xfake_acid_3:
+        case Xfake_acid_4:
+        case Xfake_acid_5:
+        case Xfake_acid_6:
+        case Xfake_acid_7:
+        case Xfake_acid_8:
+#endif
          Cave[y][x] = Ystone_sB;
          Cave[y+1][x] = Ystone_s;
          Next[y][x] = Xblank;
@@ -523,6 +543,16 @@ void synchro_2(void)
        case Yacid_splash_eB:
        case Yacid_splash_wB:
        case Zplayer:
+#if 1
+        case Xfake_acid_1:
+        case Xfake_acid_2:
+        case Xfake_acid_3:
+        case Xfake_acid_4:
+        case Xfake_acid_5:
+        case Xfake_acid_6:
+        case Xfake_acid_7:
+        case Xfake_acid_8:
+#endif
          Cave[y][x] = Ystone_sB;
          Cave[y+1][x] = Ystone_s;
          Next[y][x] = Xblank;
@@ -4292,6 +4322,38 @@ void synchro_2(void)
       Next[y][x] = Xacid_1;
       goto loop;
 
+    case Xfake_acid_1:
+      Next[y][x] = Xfake_acid_2;
+      goto loop;
+
+    case Xfake_acid_2:
+      Next[y][x] = Xfake_acid_3;
+      goto loop;
+
+    case Xfake_acid_3:
+      Next[y][x] = Xfake_acid_4;
+      goto loop;
+
+    case Xfake_acid_4:
+      Next[y][x] = Xfake_acid_5;
+      goto loop;
+
+    case Xfake_acid_5:
+      Next[y][x] = Xfake_acid_6;
+      goto loop;
+
+    case Xfake_acid_6:
+      Next[y][x] = Xfake_acid_7;
+      goto loop;
+
+    case Xfake_acid_7:
+      Next[y][x] = Xfake_acid_8;
+      goto loop;
+
+    case Xfake_acid_8:
+      Next[y][x] = Xfake_acid_1;
+      goto loop;
+
     /* --------------------------------------------------------------------- */
 
     case Xball_1:
index e07ea102e26ee56ab13af0f8f23aa7edd36a7c28..094a225e21ba432b4c9c71e3f228dfce2458ac4c 100644 (file)
@@ -4694,7 +4694,7 @@ void KeyboardAutoRepeatOffUnlessAutoplay()
 
 void OpenAll()
 {
-  InitGlobal();                /* initialize some global variables */
+  InitGlobal();                        /* initialize some global variables */
 
   if (options.execute_command)
     Execute_Command(options.execute_command);
@@ -4706,7 +4706,8 @@ void OpenAll()
 #else
     Error(ERR_WARN, "networking only supported in Unix version");
 #endif
-    exit(0);   /* never reached */
+
+    exit(0);                   /* never reached, server loops forever */
   }
 
   InitSetup();
index b00503ead130dc7253d5d930797ca700969e94d9..7ab466ab1ff11efed36c537fc952aebcda0de077 100644 (file)
@@ -3639,6 +3639,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "fake grass",
     "fake grass"
   },
+  {
+    "emc_fake_acid",
+    "fake acid",
+    "fake acid"
+  },
   {
     "emc_dripper",
     "dripper",
index d3c293354acd80b0cb1385d72345936adf0ed732..259256c8505fc698e9218f61c18fc3ee1f791b49 100644 (file)
 #define EL_EMC_WALL_SLIPPERY_3         700
 #define EL_EMC_WALL_SLIPPERY_4         701
 #define EL_EMC_FAKE_GRASS              702
-#define EL_EMC_DRIPPER                 703
+#define EL_EMC_FAKE_ACID               703
+#define EL_EMC_DRIPPER                 704
 
-#define NUM_FILE_ELEMENTS              704
+#define NUM_FILE_ELEMENTS              705
 
 
 /* "real" (and therefore drawable) runtime elements */
 #define PROGRAM_VERSION_MAJOR          3
 #define PROGRAM_VERSION_MINOR          2
 #define PROGRAM_VERSION_PATCH          0
-#define PROGRAM_VERSION_BUILD          1
+#define PROGRAM_VERSION_BUILD          2
 
 #define PROGRAM_TITLE_STRING           "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING          "Holger Schemel"
index 268cd9c83a1897fd45cd96c1272b3303c30965f3..d6c84d81a4495eb03e19eedd99ae849bfc2c4cf2 100644 (file)
@@ -2985,6 +2985,12 @@ void HandleGameActions()
 
     recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
+#if 1
+    /* !!! CHECK THIS (tape.pausing is always FALSE here!) !!! */
+    if (recorded_player_action == NULL && tape.pausing)
+      return;
+#endif
+
     for (i = 0; i < MAX_PLAYERS; i++)
     {
       summarized_player_action |= stored_player[i].action;
index 15841b17a993c0c85060d5d0ab64fd5203bb3801..33158a4856c1d2c8a45ad742f9f7f2fa8e07650d 100644 (file)
@@ -4349,6 +4349,38 @@ em_object_mapping_list[] =
     Xfake_door_8,                      TRUE,   FALSE,
     EL_EM_GATE_8_GRAY,                 -1, -1
   },
+  {
+    Xfake_acid_1,                      TRUE,   FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_2,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_3,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_4,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_5,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_6,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_7,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
+  {
+    Xfake_acid_8,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
+  },
   {
     Xsteel_1,                          TRUE,   FALSE,
     EL_STEELWALL,                      -1, -1
@@ -5798,6 +5830,14 @@ void InitGraphicInfo_EM(void)
                        i == Xacid_6 ? 50 :
                        i == Xacid_7 ? 60 :
                        i == Xacid_8 ? 70 :
+                       i == Xfake_acid_1 ? 0 :
+                       i == Xfake_acid_2 ? 10 :
+                       i == Xfake_acid_3 ? 20 :
+                       i == Xfake_acid_4 ? 30 :
+                       i == Xfake_acid_5 ? 40 :
+                       i == Xfake_acid_6 ? 50 :
+                       i == Xfake_acid_7 ? 60 :
+                       i == Xfake_acid_8 ? 70 :
                        i == Xball_2 ? 7 :
                        i == Xball_2B ? j + 8 :
                        i == Yball_eat ? j + 1 :
@@ -5950,41 +5990,45 @@ void InitGraphicInfo_EM(void)
          (effective_action == ACTION_FALLING ? MV_DOWN : direction);
        int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? 1 : 0);
        int dy = (move_dir == MV_UP   ? -1 : move_dir == MV_DOWN  ? 1 : 0);
-       int cx = ABS(dx) * TILEX / 8;
-       int cy = ABS(dy) * TILEY / 8;
+       int num_steps = (i == Ydrip_s1 ||
+                        i == Ydrip_s1B ||
+                        i == Ydrip_s2 ||
+                        i == Ydrip_s2B ? 16 : 8);
+       int cx = ABS(dx) * (TILEX / num_steps);
+       int cy = ABS(dy) * (TILEY / num_steps);
+       int step_frame = (i == Ydrip_s2 ||
+                         i == Ydrip_s2B ? j + 8 : j) + 1;
+       int step = (is_backside ? step_frame : num_steps - step_frame);
 
        if (is_backside)        /* tile where movement starts */
        {
          if (dx < 0 || dy < 0)
          {
-           g_em->src_offset_x = cx * (j + 1);
-           g_em->src_offset_y = cy * (j + 1);
+           g_em->src_offset_x = cx * step;
+           g_em->src_offset_y = cy * step;
          }
          else
          {
-           g_em->dst_offset_x = cx * (j + 1);
-           g_em->dst_offset_y = cy * (j + 1);
+           g_em->dst_offset_x = cx * step;
+           g_em->dst_offset_y = cy * step;
          }
-
-         g_em->width  = TILEX - cx * (j + 1);
-         g_em->height = TILEY - cy * (j + 1);
        }
        else                    /* tile where movement ends */
        {
          if (dx < 0 || dy < 0)
          {
-           g_em->dst_offset_x = cx * (7 - j);
-           g_em->dst_offset_y = cy * (7 - j);
+           g_em->dst_offset_x = cx * step;
+           g_em->dst_offset_y = cy * step;
          }
          else
          {
-           g_em->src_offset_x = cx * (7 - j);
-           g_em->src_offset_y = cy * (7 - j);
+           g_em->src_offset_x = cx * step;
+           g_em->src_offset_y = cy * step;
          }
-
-         g_em->width  = TILEX - cx * (7 - j);
-         g_em->height = TILEY - cy * (7 - j);
        }
+
+       g_em->width  = TILEX - cx * step;
+       g_em->height = TILEY - cy * step;
       }
 #endif