bug fixed genererterrain + minimap

git-svn-id: file:///var/svn/2010-netlemmings/trunk@211 077b3477-7977-48bd-8428-443f22f7bfda

3 files changed, 444 insertions, 287 deletions

diff --git a/level/3_test/lvl2005.ini b/level/3_test/lvl2005.ini
index 2dc10e9..f845cce 100644
--- a/level/3_test/lvl2005.ini
+++ b/level/3_test/lvl2005.ini
@@ -18,35 +18,27 @@ style = fire
 # id, xpos, ypos, paint mode (), upside down (0,1)
 # paint modes: 8=VIS_ON_TERRAIN, 4=NO_OVERWRITE, 0=FULL (only one value possible)
 object_0 = 1, 0, 16, 0, 0
-object_1 = 7, 80, 66, 0, 0
-object_2 = 1, 166, 16, 0, 0
-object_3 = 7, 246, 68, 0, 0
-object_4 = 1, 332, 16, 0, 0
-object_5 = 7, 412, 70, 0, 0
-object_6 = 1, 498, 16, 0, 0
-object_7 = 7, 578, 72, 0, 0
-object_8 = 1, 664, 16, 0, 0
-object_9 = 7, 744, 74, 0, 0
-object_10 = 1, 830, 16, 0, 0
-object_11 = 7, 910, 76, 0, 0
-object_12 = 1, 996, 16, 0, 0
-object_13 = 7, 1076, 78, 0, 0
-object_14 = 1, 1162, 16, 0, 0
-object_15 = 7, 1242, 80, 0, 0
-object_16 = 1, 1328, 16, 0, 0
-object_17 = 7, 1408, 82, 0, 0
-object_18 = 1, 1494, 16, 0, 0
-object_19 = 7, 1574, 84, 0, 0
-object_20 = 1, 1660, 16, 0, 0
-object_21 = 7, 1740, 86, 0, 0
-object_22 = 1, 1826, 16, 0, 0
-object_23 = 7, 1906, 88, 0, 0
-object_24 = 1, 1992, 16, 0, 0
-object_25 = 7, 2072, 90, 0, 0
-object_26 = 1, 2158, 16, 0, 0
-object_27 = 7, 2238, 92, 0, 0
-object_28 = 1, 2324, 16, 0, 0
-object_29 = 7, 2404, 94, 0, 0
+object_1 = 5, 280, 60, 0, 0
+object_2 = 1, 430, 16, 0, 0
+object_3 = 5, 590, 104, 4, 0
+object_4 = 1, 740, 16, 0, 0
+object_5 = 7, 900, 108, 0, 0
+object_6 = 1, 986, 16, 0, 0
+object_7 = 7, 1146, 110, 4, 0
+object_8 = 1, 1232, 16, 0, 0
+object_9 = 7, 1392, 112, 8, 0
+object_10 = 1, 1478, 16, 0, 0
+object_11 = 8, 1638, 102, 0, 0
+object_12 = 1, 1820, 16, 0, 0
+object_13 = 8, 1980, 104, 4, 0
+object_14 = 1, 2162, 16, 0, 0
+object_15 = 8, 2322, 106, 8, 0
+object_16 = 1, 2504, 16, 0, 0
+object_17 = 10, 2664, 102, 0, 0
+object_18 = 1, 2846, 16, 0, 0
+object_19 = 10, 3006, 104, 4, 0
+object_20 = 1, 0, 158, 0, 0
+object_21 = 10, 160, 248, 8, 0
 
 # Terrain
 # id, xpos, ypos, modifier
@@ -66,215 +58,343 @@ terrain_10 = 1, 200, 106, 0
 terrain_11 = 1, 200, 110, 2
 terrain_12 = 1, 240, 106, 0
 terrain_13 = 1, 240, 110, 2
-terrain_14 = 21, 144, 90, 0
-terrain_14 = 1, 166, 106, 0
-terrain_15 = 1, 166, 110, 2
-terrain_16 = 1, 206, 106, 0
-terrain_17 = 1, 206, 110, 2
-terrain_18 = 1, 246, 106, 0
-terrain_19 = 1, 246, 110, 2
-terrain_20 = 1, 286, 106, 0
-terrain_21 = 1, 286, 110, 2
-terrain_22 = 1, 326, 106, 0
-terrain_23 = 1, 326, 110, 2
-terrain_24 = 1, 366, 106, 0
-terrain_25 = 1, 366, 110, 2
-terrain_26 = 1, 406, 106, 0
-terrain_27 = 1, 406, 110, 2
-terrain_28 = 21, 310, 90, 0
-terrain_28 = 1, 332, 106, 0
-terrain_29 = 1, 332, 110, 2
-terrain_30 = 1, 372, 106, 0
-terrain_31 = 1, 372, 110, 2
-terrain_32 = 1, 412, 106, 0
-terrain_33 = 1, 412, 110, 2
-terrain_34 = 1, 452, 106, 0
-terrain_35 = 1, 452, 110, 2
-terrain_36 = 1, 492, 106, 0
-terrain_37 = 1, 492, 110, 2
-terrain_38 = 1, 532, 106, 0
-terrain_39 = 1, 532, 110, 2
-terrain_40 = 1, 572, 106, 0
-terrain_41 = 1, 572, 110, 2
-terrain_42 = 21, 476, 90, 0
-terrain_42 = 1, 498, 106, 0
-terrain_43 = 1, 498, 110, 2
-terrain_44 = 1, 538, 106, 0
-terrain_45 = 1, 538, 110, 2
-terrain_46 = 1, 578, 106, 0
-terrain_47 = 1, 578, 110, 2
-terrain_48 = 1, 618, 106, 0
-terrain_49 = 1, 618, 110, 2
-terrain_50 = 1, 658, 106, 0
-terrain_51 = 1, 658, 110, 2
-terrain_52 = 1, 698, 106, 0
-terrain_53 = 1, 698, 110, 2
-terrain_54 = 1, 738, 106, 0
-terrain_55 = 1, 738, 110, 2
-terrain_56 = 21, 642, 90, 0
-terrain_56 = 1, 664, 106, 0
-terrain_57 = 1, 664, 110, 2
-terrain_58 = 1, 704, 106, 0
-terrain_59 = 1, 704, 110, 2
-terrain_60 = 1, 744, 106, 0
-terrain_61 = 1, 744, 110, 2
-terrain_62 = 1, 784, 106, 0
-terrain_63 = 1, 784, 110, 2
-terrain_64 = 1, 824, 106, 0
-terrain_65 = 1, 824, 110, 2
-terrain_66 = 1, 864, 106, 0
-terrain_67 = 1, 864, 110, 2
-terrain_68 = 1, 904, 106, 0
-terrain_69 = 1, 904, 110, 2
-terrain_70 = 21, 808, 90, 0
-terrain_70 = 1, 830, 106, 0
-terrain_71 = 1, 830, 110, 2
-terrain_72 = 1, 870, 106, 0
-terrain_73 = 1, 870, 110, 2
-terrain_74 = 1, 910, 106, 0
-terrain_75 = 1, 910, 110, 2
-terrain_76 = 1, 950, 106, 0
-terrain_77 = 1, 950, 110, 2
-terrain_78 = 1, 990, 106, 0
-terrain_79 = 1, 990, 110, 2
-terrain_80 = 1, 1030, 106, 0
-terrain_81 = 1, 1030, 110, 2
-terrain_82 = 1, 1070, 106, 0
-terrain_83 = 1, 1070, 110, 2
-terrain_84 = 21, 974, 90, 0
-terrain_84 = 1, 996, 106, 0
-terrain_85 = 1, 996, 110, 2
-terrain_86 = 1, 1036, 106, 0
-terrain_87 = 1, 1036, 110, 2
-terrain_88 = 1, 1076, 106, 0
-terrain_89 = 1, 1076, 110, 2
-terrain_90 = 1, 1116, 106, 0
-terrain_91 = 1, 1116, 110, 2
-terrain_92 = 1, 1156, 106, 0
-terrain_93 = 1, 1156, 110, 2
-terrain_94 = 1, 1196, 106, 0
-terrain_95 = 1, 1196, 110, 2
-terrain_96 = 1, 1236, 106, 0
-terrain_97 = 1, 1236, 110, 2
-terrain_98 = 21, 1140, 90, 0
-terrain_98 = 1, 1162, 106, 0
-terrain_99 = 1, 1162, 110, 2
-terrain_100 = 1, 1202, 106, 0
-terrain_101 = 1, 1202, 110, 2
-terrain_102 = 1, 1242, 106, 0
-terrain_103 = 1, 1242, 110, 2
-terrain_104 = 1, 1282, 106, 0
-terrain_105 = 1, 1282, 110, 2
-terrain_106 = 1, 1322, 106, 0
-terrain_107 = 1, 1322, 110, 2
-terrain_108 = 1, 1362, 106, 0
-terrain_109 = 1, 1362, 110, 2
-terrain_110 = 1, 1402, 106, 0
-terrain_111 = 1, 1402, 110, 2
-terrain_112 = 21, 1306, 90, 0
-terrain_112 = 1, 1328, 106, 0
-terrain_113 = 1, 1328, 110, 2
-terrain_114 = 1, 1368, 106, 0
-terrain_115 = 1, 1368, 110, 2
-terrain_116 = 1, 1408, 106, 0
-terrain_117 = 1, 1408, 110, 2
-terrain_118 = 1, 1448, 106, 0
-terrain_119 = 1, 1448, 110, 2
-terrain_120 = 1, 1488, 106, 0
-terrain_121 = 1, 1488, 110, 2
-terrain_122 = 1, 1528, 106, 0
-terrain_123 = 1, 1528, 110, 2
-terrain_124 = 1, 1568, 106, 0
-terrain_125 = 1, 1568, 110, 2
-terrain_126 = 21, 1472, 90, 0
-terrain_126 = 1, 1494, 106, 0
-terrain_127 = 1, 1494, 110, 2
-terrain_128 = 1, 1534, 106, 0
-terrain_129 = 1, 1534, 110, 2
-terrain_130 = 1, 1574, 106, 0
-terrain_131 = 1, 1574, 110, 2
-terrain_132 = 1, 1614, 106, 0
-terrain_133 = 1, 1614, 110, 2
-terrain_134 = 1, 1654, 106, 0
-terrain_135 = 1, 1654, 110, 2
-terrain_136 = 1, 1694, 106, 0
-terrain_137 = 1, 1694, 110, 2
-terrain_138 = 1, 1734, 106, 0
-terrain_139 = 1, 1734, 110, 2
-terrain_140 = 21, 1638, 90, 0
-terrain_140 = 1, 1660, 106, 0
-terrain_141 = 1, 1660, 110, 2
-terrain_142 = 1, 1700, 106, 0
-terrain_143 = 1, 1700, 110, 2
-terrain_144 = 1, 1740, 106, 0
-terrain_145 = 1, 1740, 110, 2
-terrain_146 = 1, 1780, 106, 0
-terrain_147 = 1, 1780, 110, 2
-terrain_148 = 1, 1820, 106, 0
-terrain_149 = 1, 1820, 110, 2
-terrain_150 = 1, 1860, 106, 0
-terrain_151 = 1, 1860, 110, 2
-terrain_152 = 1, 1900, 106, 0
-terrain_153 = 1, 1900, 110, 2
-terrain_154 = 21, 1804, 90, 0
-terrain_154 = 1, 1826, 106, 0
-terrain_155 = 1, 1826, 110, 2
-terrain_156 = 1, 1866, 106, 0
-terrain_157 = 1, 1866, 110, 2
-terrain_158 = 1, 1906, 106, 0
-terrain_159 = 1, 1906, 110, 2
-terrain_160 = 1, 1946, 106, 0
-terrain_161 = 1, 1946, 110, 2
-terrain_162 = 1, 1986, 106, 0
-terrain_163 = 1, 1986, 110, 2
-terrain_164 = 1, 2026, 106, 0
-terrain_165 = 1, 2026, 110, 2
-terrain_166 = 1, 2066, 106, 0
-terrain_167 = 1, 2066, 110, 2
-terrain_168 = 21, 1970, 90, 0
-terrain_168 = 1, 1992, 106, 0
-terrain_169 = 1, 1992, 110, 2
-terrain_170 = 1, 2032, 106, 0
-terrain_171 = 1, 2032, 110, 2
-terrain_172 = 1, 2072, 106, 0
-terrain_173 = 1, 2072, 110, 2
-terrain_174 = 1, 2112, 106, 0
-terrain_175 = 1, 2112, 110, 2
-terrain_176 = 1, 2152, 106, 0
-terrain_177 = 1, 2152, 110, 2
-terrain_178 = 1, 2192, 106, 0
-terrain_179 = 1, 2192, 110, 2
-terrain_180 = 1, 2232, 106, 0
-terrain_181 = 1, 2232, 110, 2
-terrain_182 = 21, 2136, 90, 0
-terrain_182 = 1, 2158, 106, 0
-terrain_183 = 1, 2158, 110, 2
-terrain_184 = 1, 2198, 106, 0
-terrain_185 = 1, 2198, 110, 2
-terrain_186 = 1, 2238, 106, 0
-terrain_187 = 1, 2238, 110, 2
-terrain_188 = 1, 2278, 106, 0
-terrain_189 = 1, 2278, 110, 2
-terrain_190 = 1, 2318, 106, 0
-terrain_191 = 1, 2318, 110, 2
-terrain_192 = 1, 2358, 106, 0
-terrain_193 = 1, 2358, 110, 2
-terrain_194 = 1, 2398, 106, 0
-terrain_195 = 1, 2398, 110, 2
-terrain_196 = 21, 2302, 90, 0
-terrain_196 = 1, 2324, 106, 0
-terrain_197 = 1, 2324, 110, 2
-terrain_198 = 1, 2364, 106, 0
-terrain_199 = 1, 2364, 110, 2
-terrain_200 = 1, 2404, 106, 0
-terrain_201 = 1, 2404, 110, 2
-terrain_202 = 1, 2444, 106, 0
-terrain_203 = 1, 2444, 110, 2
-terrain_204 = 1, 2484, 106, 0
-terrain_205 = 1, 2484, 110, 2
-terrain_206 = 1, 2524, 106, 0
-terrain_207 = 1, 2524, 110, 2
-terrain_208 = 1, 2564, 106, 0
-terrain_209 = 1, 2564, 110, 2
-terrain_210 = 21, 2468, 90, 0
-name = Test fire(5) O(7) T(7) M(0)  
+terrain_14 = 1, 260, 106, 0
+terrain_15 = 1, 260, 110, 2
+terrain_16 = 1, 280, 106, 0
+terrain_17 = 1, 280, 110, 2
+terrain_18 = 1, 300, 106, 0
+terrain_19 = 1, 300, 110, 2
+terrain_20 = 1, 320, 106, 0
+terrain_21 = 1, 320, 110, 2
+terrain_22 = 1, 340, 106, 0
+terrain_23 = 1, 340, 110, 2
+terrain_24 = 1, 360, 106, 0
+terrain_25 = 1, 360, 110, 2
+terrain_26 = 1, 380, 106, 0
+terrain_27 = 1, 380, 110, 2
+terrain_28 = 1, 400, 106, 0
+terrain_29 = 1, 400, 110, 2
+terrain_30 = 1, 420, 106, 0
+terrain_31 = 1, 420, 110, 2
+terrain_32 = 1, 440, 106, 0
+terrain_33 = 1, 440, 110, 2
+terrain_34 = 1, 460, 106, 0
+terrain_35 = 1, 460, 110, 2
+terrain_36 = 21, 408, 90, 0
+terrain_36 = 1, 430, 106, 8
+terrain_37 = 1, 450, 108, 8
+terrain_38 = 1, 470, 112, 8
+terrain_39 = 1, 490, 118, 8
+terrain_40 = 1, 510, 126, 8
+terrain_41 = 1, 530, 136, 8
+terrain_42 = 1, 550, 148, 0
+terrain_43 = 1, 550, 152, 2
+terrain_44 = 1, 570, 148, 0
+terrain_45 = 1, 570, 152, 2
+terrain_46 = 1, 590, 148, 0
+terrain_47 = 1, 590, 152, 2
+terrain_48 = 1, 610, 148, 0
+terrain_49 = 1, 610, 152, 2
+terrain_50 = 1, 630, 148, 0
+terrain_51 = 1, 630, 152, 2
+terrain_52 = 1, 650, 148, 0
+terrain_53 = 1, 650, 152, 2
+terrain_54 = 1, 670, 148, 0
+terrain_55 = 1, 670, 152, 2
+terrain_56 = 1, 690, 148, 0
+terrain_57 = 1, 690, 152, 2
+terrain_58 = 1, 710, 148, 0
+terrain_59 = 1, 710, 152, 2
+terrain_60 = 1, 730, 148, 0
+terrain_61 = 1, 730, 152, 2
+terrain_62 = 1, 750, 148, 0
+terrain_63 = 1, 750, 152, 2
+terrain_64 = 1, 770, 148, 0
+terrain_65 = 1, 770, 152, 2
+terrain_66 = 21, 718, 132, 0
+terrain_66 = 1, 740, 106, 8
+terrain_67 = 1, 760, 108, 8
+terrain_68 = 1, 780, 112, 8
+terrain_69 = 1, 800, 118, 8
+terrain_70 = 1, 820, 126, 8
+terrain_71 = 1, 840, 136, 8
+terrain_72 = 1, 860, 148, 0
+terrain_73 = 1, 860, 152, 2
+terrain_74 = 1, 880, 148, 0
+terrain_75 = 1, 880, 152, 2
+terrain_76 = 1, 900, 148, 0
+terrain_77 = 1, 900, 152, 2
+terrain_78 = 1, 920, 148, 0
+terrain_79 = 1, 920, 152, 2
+terrain_80 = 1, 940, 148, 0
+terrain_81 = 1, 940, 152, 2
+terrain_82 = 1, 960, 148, 0
+terrain_83 = 1, 960, 152, 2
+terrain_84 = 1, 980, 148, 0
+terrain_85 = 1, 980, 152, 2
+terrain_86 = 1, 1000, 148, 0
+terrain_87 = 1, 1000, 152, 2
+terrain_88 = 1, 1020, 148, 0
+terrain_89 = 1, 1020, 152, 2
+terrain_90 = 21, 964, 132, 0
+terrain_90 = 1, 986, 106, 8
+terrain_91 = 1, 1006, 108, 8
+terrain_92 = 1, 1026, 112, 8
+terrain_93 = 1, 1046, 118, 8
+terrain_94 = 1, 1066, 126, 8
+terrain_95 = 1, 1086, 136, 8
+terrain_96 = 1, 1106, 148, 0
+terrain_97 = 1, 1106, 152, 2
+terrain_98 = 1, 1126, 148, 0
+terrain_99 = 1, 1126, 152, 2
+terrain_100 = 1, 1146, 148, 0
+terrain_101 = 1, 1146, 152, 2
+terrain_102 = 1, 1166, 148, 0
+terrain_103 = 1, 1166, 152, 2
+terrain_104 = 1, 1186, 148, 0
+terrain_105 = 1, 1186, 152, 2
+terrain_106 = 1, 1206, 148, 0
+terrain_107 = 1, 1206, 152, 2
+terrain_108 = 1, 1226, 148, 0
+terrain_109 = 1, 1226, 152, 2
+terrain_110 = 1, 1246, 148, 0
+terrain_111 = 1, 1246, 152, 2
+terrain_112 = 1, 1266, 148, 0
+terrain_113 = 1, 1266, 152, 2
+terrain_114 = 21, 1210, 132, 0
+terrain_114 = 1, 1232, 106, 8
+terrain_115 = 1, 1252, 108, 8
+terrain_116 = 1, 1272, 112, 8
+terrain_117 = 1, 1292, 118, 8
+terrain_118 = 1, 1312, 126, 8
+terrain_119 = 1, 1332, 136, 8
+terrain_120 = 1, 1352, 148, 0
+terrain_121 = 1, 1352, 152, 2
+terrain_122 = 1, 1372, 148, 0
+terrain_123 = 1, 1372, 152, 2
+terrain_124 = 1, 1392, 148, 0
+terrain_125 = 1, 1392, 152, 2
+terrain_126 = 1, 1412, 148, 0
+terrain_127 = 1, 1412, 152, 2
+terrain_128 = 1, 1432, 148, 0
+terrain_129 = 1, 1432, 152, 2
+terrain_130 = 1, 1452, 148, 0
+terrain_131 = 1, 1452, 152, 2
+terrain_132 = 1, 1472, 148, 0
+terrain_133 = 1, 1472, 152, 2
+terrain_134 = 1, 1492, 148, 0
+terrain_135 = 1, 1492, 152, 2
+terrain_136 = 1, 1512, 148, 0
+terrain_137 = 1, 1512, 152, 2
+terrain_138 = 21, 1456, 132, 0
+terrain_138 = 1, 1478, 106, 8
+terrain_139 = 1, 1498, 108, 8
+terrain_140 = 1, 1518, 112, 8
+terrain_141 = 1, 1538, 118, 8
+terrain_142 = 1, 1558, 126, 8
+terrain_143 = 1, 1578, 136, 8
+terrain_144 = 1, 1598, 148, 0
+terrain_145 = 1, 1598, 152, 2
+terrain_146 = 1, 1618, 148, 0
+terrain_147 = 1, 1618, 152, 2
+terrain_148 = 1, 1638, 148, 0
+terrain_149 = 1, 1638, 152, 2
+terrain_150 = 1, 1658, 148, 0
+terrain_151 = 1, 1658, 152, 2
+terrain_152 = 1, 1678, 148, 0
+terrain_153 = 1, 1678, 152, 2
+terrain_154 = 1, 1698, 148, 0
+terrain_155 = 1, 1698, 152, 2
+terrain_156 = 1, 1718, 148, 0
+terrain_157 = 1, 1718, 152, 2
+terrain_158 = 1, 1738, 148, 0
+terrain_159 = 1, 1738, 152, 2
+terrain_160 = 1, 1758, 148, 0
+terrain_161 = 1, 1758, 152, 2
+terrain_162 = 1, 1778, 148, 0
+terrain_163 = 1, 1778, 152, 2
+terrain_164 = 1, 1798, 148, 0
+terrain_165 = 1, 1798, 152, 2
+terrain_166 = 1, 1818, 148, 0
+terrain_167 = 1, 1818, 152, 2
+terrain_168 = 1, 1838, 148, 0
+terrain_169 = 1, 1838, 152, 2
+terrain_170 = 1, 1858, 148, 0
+terrain_171 = 1, 1858, 152, 2
+terrain_172 = 21, 1798, 132, 0
+terrain_172 = 1, 1820, 106, 8
+terrain_173 = 1, 1840, 108, 8
+terrain_174 = 1, 1860, 112, 8
+terrain_175 = 1, 1880, 118, 8
+terrain_176 = 1, 1900, 126, 8
+terrain_177 = 1, 1920, 136, 8
+terrain_178 = 1, 1940, 148, 0
+terrain_179 = 1, 1940, 152, 2
+terrain_180 = 1, 1960, 148, 0
+terrain_181 = 1, 1960, 152, 2
+terrain_182 = 1, 1980, 148, 0
+terrain_183 = 1, 1980, 152, 2
+terrain_184 = 1, 2000, 148, 0
+terrain_185 = 1, 2000, 152, 2
+terrain_186 = 1, 2020, 148, 0
+terrain_187 = 1, 2020, 152, 2
+terrain_188 = 1, 2040, 148, 0
+terrain_189 = 1, 2040, 152, 2
+terrain_190 = 1, 2060, 148, 0
+terrain_191 = 1, 2060, 152, 2
+terrain_192 = 1, 2080, 148, 0
+terrain_193 = 1, 2080, 152, 2
+terrain_194 = 1, 2100, 148, 0
+terrain_195 = 1, 2100, 152, 2
+terrain_196 = 1, 2120, 148, 0
+terrain_197 = 1, 2120, 152, 2
+terrain_198 = 1, 2140, 148, 0
+terrain_199 = 1, 2140, 152, 2
+terrain_200 = 1, 2160, 148, 0
+terrain_201 = 1, 2160, 152, 2
+terrain_202 = 1, 2180, 148, 0
+terrain_203 = 1, 2180, 152, 2
+terrain_204 = 1, 2200, 148, 0
+terrain_205 = 1, 2200, 152, 2
+terrain_206 = 21, 2140, 132, 0
+terrain_206 = 1, 2162, 106, 8
+terrain_207 = 1, 2182, 108, 8
+terrain_208 = 1, 2202, 112, 8
+terrain_209 = 1, 2222, 118, 8
+terrain_210 = 1, 2242, 126, 8
+terrain_211 = 1, 2262, 136, 8
+terrain_212 = 1, 2282, 148, 0
+terrain_213 = 1, 2282, 152, 2
+terrain_214 = 1, 2302, 148, 0
+terrain_215 = 1, 2302, 152, 2
+terrain_216 = 1, 2322, 148, 0
+terrain_217 = 1, 2322, 152, 2
+terrain_218 = 1, 2342, 148, 0
+terrain_219 = 1, 2342, 152, 2
+terrain_220 = 1, 2362, 148, 0
+terrain_221 = 1, 2362, 152, 2
+terrain_222 = 1, 2382, 148, 0
+terrain_223 = 1, 2382, 152, 2
+terrain_224 = 1, 2402, 148, 0
+terrain_225 = 1, 2402, 152, 2
+terrain_226 = 1, 2422, 148, 0
+terrain_227 = 1, 2422, 152, 2
+terrain_228 = 1, 2442, 148, 0
+terrain_229 = 1, 2442, 152, 2
+terrain_230 = 1, 2462, 148, 0
+terrain_231 = 1, 2462, 152, 2
+terrain_232 = 1, 2482, 148, 0
+terrain_233 = 1, 2482, 152, 2
+terrain_234 = 1, 2502, 148, 0
+terrain_235 = 1, 2502, 152, 2
+terrain_236 = 1, 2522, 148, 0
+terrain_237 = 1, 2522, 152, 2
+terrain_238 = 1, 2542, 148, 0
+terrain_239 = 1, 2542, 152, 2
+terrain_240 = 21, 2482, 132, 0
+terrain_240 = 1, 2504, 106, 8
+terrain_241 = 1, 2524, 108, 8
+terrain_242 = 1, 2544, 112, 8
+terrain_243 = 1, 2564, 118, 8
+terrain_244 = 1, 2584, 126, 8
+terrain_245 = 1, 2604, 136, 8
+terrain_246 = 1, 2624, 148, 0
+terrain_247 = 1, 2624, 152, 2
+terrain_248 = 1, 2644, 148, 0
+terrain_249 = 1, 2644, 152, 2
+terrain_250 = 1, 2664, 148, 0
+terrain_251 = 1, 2664, 152, 2
+terrain_252 = 1, 2684, 148, 0
+terrain_253 = 1, 2684, 152, 2
+terrain_254 = 1, 2704, 148, 0
+terrain_255 = 1, 2704, 152, 2
+terrain_256 = 1, 2724, 148, 0
+terrain_257 = 1, 2724, 152, 2
+terrain_258 = 1, 2744, 148, 0
+terrain_259 = 1, 2744, 152, 2
+terrain_260 = 1, 2764, 148, 0
+terrain_261 = 1, 2764, 152, 2
+terrain_262 = 1, 2784, 148, 0
+terrain_263 = 1, 2784, 152, 2
+terrain_264 = 1, 2804, 148, 0
+terrain_265 = 1, 2804, 152, 2
+terrain_266 = 1, 2824, 148, 0
+terrain_267 = 1, 2824, 152, 2
+terrain_268 = 1, 2844, 148, 0
+terrain_269 = 1, 2844, 152, 2
+terrain_270 = 1, 2864, 148, 0
+terrain_271 = 1, 2864, 152, 2
+terrain_272 = 1, 2884, 148, 0
+terrain_273 = 1, 2884, 152, 2
+terrain_274 = 21, 2824, 132, 0
+terrain_274 = 1, 2846, 106, 8
+terrain_275 = 1, 2866, 108, 8
+terrain_276 = 1, 2886, 112, 8
+terrain_277 = 1, 2906, 118, 8
+terrain_278 = 1, 2926, 126, 8
+terrain_279 = 1, 2946, 136, 8
+terrain_280 = 1, 2966, 148, 0
+terrain_281 = 1, 2966, 152, 2
+terrain_282 = 1, 2986, 148, 0
+terrain_283 = 1, 2986, 152, 2
+terrain_284 = 1, 3006, 148, 0
+terrain_285 = 1, 3006, 152, 2
+terrain_286 = 1, 3026, 148, 0
+terrain_287 = 1, 3026, 152, 2
+terrain_288 = 1, 3046, 148, 0
+terrain_289 = 1, 3046, 152, 2
+terrain_290 = 1, 3066, 148, 0
+terrain_291 = 1, 3066, 152, 2
+terrain_292 = 1, 3086, 148, 0
+terrain_293 = 1, 3086, 152, 2
+terrain_294 = 1, 3106, 148, 0
+terrain_295 = 1, 3106, 152, 2
+terrain_296 = 1, 3126, 148, 0
+terrain_297 = 1, 3126, 152, 2
+terrain_298 = 1, 3146, 148, 0
+terrain_299 = 1, 3146, 152, 2
+terrain_300 = 1, 3166, 148, 0
+terrain_301 = 1, 3166, 152, 2
+terrain_302 = 1, 3186, 148, 0
+terrain_303 = 1, 3186, 152, 2
+terrain_304 = 1, 3206, 148, 0
+terrain_305 = 1, 3206, 152, 2
+terrain_306 = 1, 3226, 148, 0
+terrain_307 = 1, 3226, 152, 2
+terrain_308 = 21, 3166, 132, 0
+terrain_308 = 1, 0, 248, 8
+terrain_309 = 1, 20, 250, 8
+terrain_310 = 1, 40, 254, 8
+terrain_311 = 1, 60, 260, 8
+terrain_312 = 1, 80, 268, 8
+terrain_313 = 1, 100, 278, 8
+terrain_314 = 1, 120, 290, 0
+terrain_315 = 1, 120, 294, 2
+terrain_316 = 1, 140, 290, 0
+terrain_317 = 1, 140, 294, 2
+terrain_318 = 1, 160, 290, 0
+terrain_319 = 1, 160, 294, 2
+terrain_320 = 1, 180, 290, 0
+terrain_321 = 1, 180, 294, 2
+terrain_322 = 1, 200, 290, 0
+terrain_323 = 1, 200, 294, 2
+terrain_324 = 1, 220, 290, 0
+terrain_325 = 1, 220, 294, 2
+terrain_326 = 1, 240, 290, 0
+terrain_327 = 1, 240, 294, 2
+terrain_328 = 1, 260, 290, 0
+terrain_329 = 1, 260, 294, 2
+terrain_330 = 1, 280, 290, 0
+terrain_331 = 1, 280, 294, 2
+terrain_332 = 1, 300, 290, 0
+terrain_333 = 1, 300, 294, 2
+terrain_334 = 1, 320, 290, 0
+terrain_335 = 1, 320, 294, 2
+terrain_336 = 1, 340, 290, 0
+terrain_337 = 1, 340, 294, 2
+terrain_338 = 1, 360, 290, 0
+terrain_339 = 1, 360, 294, 2
+terrain_340 = 1, 380, 290, 0
+terrain_341 = 1, 380, 294, 2
+terrain_342 = 21, 320, 274, 0
+name = Test fire(5) O(10) T(7) M(8)  
diff --git a/scripts/genererTerrain.sh b/scripts/genererTerrain.sh
index c961fc7..196094b 100755
--- a/scripts/genererTerrain.sh
+++ b/scripts/genererTerrain.sh
@@ -233,11 +233,11 @@ do
 				
 				if [ $typeObjet -eq "5" ]
 				then				case $j in
-					0)
+					1)
 					 mode=0 ;;
-					1) 
+					2) 
 					 mode=4 ;;
-					2)
+					3)
 					 mode=99 ;;
 					*)
 					 mode=99 ;;
@@ -245,11 +245,11 @@ do
 				else 
 					if [ $typeObjet -eq "6" ]
 						then 				case $j in
-					0)
+					1)
 					 mode=0 ;;
-					1) 
+					2) 
 					 mode=4 ;;
-					2)
+					3)
 					 mode=8 ;;
 					*)
 					 mode=99 ;;
@@ -257,11 +257,11 @@ do
 						else 
 							if [ $typeObjet -eq "7" ]
 								then 				case $j in
-					0)
+					1)
 					 mode=0 ;;
-					1) 
+					2) 
 					 mode=4 ;;
-					2)
+					3)
 					 mode=8 ;;
 					*)
 					 mode=99 ;;
@@ -325,7 +325,7 @@ do
 			# pour tous les object 
 			if [ true -o "$cpt" -eq "0" -o $numObjetTest -ne 99 ] #pour les objets specifiques
 			then 
-				echo "object_$cpt = 1, $xObjet, $hDoor, $mode, 0" >> $pathDst/lvl200$numStyle.ini
+				echo "object_$cpt = 1, $xObjet, $hDoor, 0, 0" >> $pathDst/lvl200$numStyle.ini
 				cpt=$(($cpt+1))
 			
 				#echo "terrain_$cptT = $numTerrain, $xObjet, $yTerrain, 8" >> $pathDst/lvlTempT.ini
@@ -427,7 +427,7 @@ do
 
 		if [ $numObjetTest -eq 99 -a $j -eq 3 ]
 			then break
-			else numObjetTest=$numObjetTest
+			else yTerrain=$(($hDoor + 90))
 		fi
 
 	done
diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
index df0e46d..88695d3 100644
--- a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
@@ -389,7 +389,7 @@ int stateLemming(struct gameInit *gInit){
 
 	struct listeSimplementChainee *k;
 	struct listeSimplementChainee *o;
-	SDL_Rect from,to;
+	SDL_Rect to;
 	SDL_Surface *sfT;
 	int boom=0;
 	int flip=0;
@@ -1612,8 +1612,9 @@ int stateLemming(struct gameInit *gInit){
 	int miniMap (SDL_Surface *s, int x0, int y0, float coefX, float coefY){
 
 
-		int i,j,stepScreenX,stepScreenY,sizeMiniMapPixel_X,sizeMiniMapPixel_Y,w0,h0,x,y;
-		SDL_Rect rect;
+		int i,j,stepScreenX,stepScreenY,sizeMiniMapPixel_X,sizeMiniMapPixel_Y;
+		int w0,h0,x,y,cpt=0;
+		SDL_Rect rect,from;
 		Uint32 err;
 		//int cpt=0;
 
@@ -1674,6 +1675,15 @@ int stateLemming(struct gameInit *gInit){
 			if(coefY>1.) {h0=LEVEL_HEIGHT-y0;}
 			else {y0=LEVEL_HEIGHT-h0;}
 		}
+		/*
+		if(h0/2+y0 != MINIMAP_Y0+MINIMAP_MY/2){
+			y0 += (MINIMAP_Y0+MINIMAP_MY/2)-(h0/2+y0);
+		}
+		
+		if(w0/2+x0 != MINIMAP_X0+MINIMAP_MX/2){
+			x0 += (MINIMAP_X0+MINIMAP_MX/2)-(w0/2+x0);
+		}*/
+		
 
 		if((w0 + x0 >LEVEL_WIDTH)||(h0 + y0 > LEVEL_HEIGHT)){return 0;}
 
@@ -1694,27 +1704,51 @@ int stateLemming(struct gameInit *gInit){
 
 
 		//SDL_LockSurface(s);
-		for(j=0;j<h0;j+=stepScreenY){
-			if((y0+j)<0){continue;}
-			rect.y=MINIMAP_Y0+(j/stepScreenY)*sizeMiniMapPixel_Y;
-			if(rect.y>MINIMAP_Y0+MINIMAP_MY){break;}
-			if(rect.h+rect.y>MINIMAP_Y0+MINIMAP_MY){break;}
-
-			for(i=0;i<w0;i+=stepScreenX){
-				//cpt++;
-
-				if((x0+i)<0){continue;}
-				rect.x=MINIMAP_X0+(i/stepScreenX)*sizeMiniMapPixel_X;
-				if(rect.x>MINIMAP_X0+MINIMAP_MX){break;}
-				if(rect.w+rect.x>MINIMAP_X0+MINIMAP_MX){break;}
-
-				err=get_pixel32(x0+i,y0+j,s);
-				if(err==ccc_error){return 123;}
+		if((coefX==1.) && (coefX==coefY)){
+		
+		from.x=x0;
+		from.y=y0;
+		from.w=MINIMAP_MX;
+		from.h=MINIMAP_MY;
+		
+		rect.x=MINIMAP_X0;
+		rect.y=MINIMAP_Y0;
+		rect.w=MINIMAP_MX;
+		rect.h=MINIMAP_MY;
+		
+		test_blit(s,&from,pInterface,&rect,0);
+		
+		} else {
+			for(j=0;j<h0;j+=stepScreenY){
+				if((y0+j)<0){continue;}
+				rect.y=MINIMAP_Y0+(j/stepScreenY)*sizeMiniMapPixel_Y;
+				if(rect.y>MINIMAP_Y0+MINIMAP_MY){break;}
+				if(rect.h+rect.y>MINIMAP_Y0+MINIMAP_MY){break;}
+				cpt++;
+				for(i=0;i<w0;i+=stepScreenX){
+					//cpt++;
+
+					if((x0+i)<0){continue;}
+					rect.x=MINIMAP_X0+(i/stepScreenX)*sizeMiniMapPixel_X;
+					if(rect.x>MINIMAP_X0+MINIMAP_MX){break;}
+					if(rect.w+rect.x>MINIMAP_X0+MINIMAP_MX){break;}
+
+					err=get_pixel32(x0+i,y0+j,s);
+					if(err==ccc_error){return 123;}
 
-				test_FillRect(pInterface, &rect, err,0);
+					test_FillRect(pInterface, &rect, err,0);
 
-			}	
+				}	
+			}
+			if(coefY<1.){
+			rect.x=MINIMAP_X0;
+			rect.y=MINIMAP_Y0;
+			rect.w=MINIMAP_MX;
+			rect.h=MINIMAP_MY - cpt*sizeMiniMapPixel_Y  ;
+			test_FillRect(pInterface, &rect, 0,0);
+			}
 		}
+		
 		//SDL_UnlockSurface(s);
 
 		//printf("cpt = %d\n",cpt);
@@ -2900,9 +2934,11 @@ int lancement (){
 	int err=0;
 	//Ce qui va nous permettre de quitter
 	int quit = 0;
+	int b=0;
 	SDL_Rect camera,inter,miniMapR;
 	int mouseX,mouseY=0;
-	long tick,temps=0;
+	long tick;
+	//long temps=0;
 	float	fps = 0.0;
 	int	fps_count = 0;
 	int	fps_start = 0;
@@ -3026,37 +3062,38 @@ int lancement (){
 
 		//Tant qu'il y a un événement
 		while( SDL_PollEvent( &event ) )
-		{
+		{ 
+			b=(b==0)?1:0;
 			switch(event.key.keysym.sym){
-				case SDLK_HOME : gInit.tps.boostFps = 500-FPS; break;
-				case SDLK_END : gInit.tps.boostFps = -(FPS-11); break;
-				case SDLK_PAGEUP : if(gInit.tps.boostFps<(500-FPS)){gInit.tps.boostFps +=1;}break;
-				case SDLK_PAGEDOWN : if(gInit.tps.boostFps>(-FPS+1)){gInit.tps.boostFps -=1;}break;
+				case SDLK_HOME : if(b){gInit.tps.boostFps = 500-FPS;} break;
+				case SDLK_END : if(b){gInit.tps.boostFps = -(FPS-11);} break;
+				case SDLK_PAGEUP : if(b){if(gInit.tps.boostFps<(500-FPS)){gInit.tps.boostFps +=1;}}break;
+				case SDLK_PAGEDOWN : if(b){if(gInit.tps.boostFps>(-FPS+1)){gInit.tps.boostFps -=1;}}break;
 				case SDLK_w : paint_stencil= (paint_stencil==0)? 1 : ((paint_stencil==1)? 2 : ((paint_stencil==2)? 3 : 0)) ;permission=0;break;
 				case SDLK_x : switchMiniMapMode= (switchMiniMapMode==0)? 1 : ((switchMiniMapMode==1)? 2 : ((switchMiniMapMode==2)? 3 : 0)) ;permission=0;break;
-				case SDLK_p :{
+				case SDLK_p :if(b){ 
 						     zoomX=((zoomX >= 1. )? zoomX + 1. : zoomX + 0.1 );
 						     zoomY=((zoomY >= 1. )? zoomY + 1. : zoomY + 0.1 );
 						     if(zoomX > 10.) {zoomX=10.;}
 						     if(zoomY > 10.) {zoomY=10.;}
-						     break;
 					     }
-				case SDLK_m :{
+						     break;
+				case SDLK_m : if(b){
 						     zoomX=((zoomX > 1. )? zoomX - 1. : zoomX - 0.1 );
 						     zoomY=((zoomY > 1. )? zoomY - 1. : zoomY - 0.1 );
-						     if(zoomX <= 0.) {zoomX=0.1;}
-						     if(zoomY <= 0.) {zoomY=0.1;}
-						     break;
+						     if(zoomX <= 0.1) {zoomX=0.1;}
+						     if(zoomY <= 0.1) {zoomY=0.1;}
 					     }
+						     break;
 				case SDLK_ESCAPE : quit = 1; break;
 				default:break;
 			}
 			//  SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
 
 			switch (event.type) {
-				case SDL_MOUSEMOTION: { mouseX = event.motion.x;
+				case SDL_MOUSEMOTION: { b=(b==0)?1:0; mouseX = event.motion.x;
 							      mouseY = event.motion.y;break; }
-				case SDL_MOUSEBUTTONDOWN: { permission=0;err=mouse_action (&gInit, mouseX, mouseY,camera.x,camera.y );
+				case SDL_MOUSEBUTTONDOWN: { b=(b==0)?1:0; permission=0;err=mouse_action (&gInit, mouseX, mouseY,camera.x,camera.y );
 								  if(err!=0){return err;}
 								  break;}
 				case SDL_QUIT : {