From 5256caadef6c3c29d4a2fd29618b987a7e2a9744 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Wed, 22 Dec 2010 21:22:50 +0000 Subject: Debug des dirty rectangles in progress. 3 bugs corrigés, il en reste d'autres. Snif. Je me couche. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///var/svn/2010-netlemmings/trunk@210 077b3477-7977-48bd-8428-443f22f7bfda --- level/3_test/lvl2005.ini | 494 ++++++++++++++++++++++++----------------------- src/graphic.c | 11 ++ src/include/graphic.h | 1 + src/netlem.c | 6 +- 4 files changed, 270 insertions(+), 242 deletions(-) diff --git a/level/3_test/lvl2005.ini b/level/3_test/lvl2005.ini index 96f0e71..2dc10e9 100644 --- a/level/3_test/lvl2005.ini +++ b/level/3_test/lvl2005.ini @@ -17,250 +17,264 @@ style = fire # Objects # 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, 4, 0 -object_1 = 5, 280, 60, 4, 0 -object_2 = 1, 430, 16, 4, 0 -object_3 = 7, 590, 108, 4, 0 -object_4 = 1, 676, 16, 8, 0 -object_5 = 7, 836, 152, 8, 0 -object_6 = 1, 922, 16, 4, 0 -object_7 = 8, 1082, 102, 4, 0 -object_8 = 1, 1264, 16, 8, 0 -object_9 = 8, 1424, 146, 8, 0 -object_10 = 1, 1606, 16, 4, 0 -object_11 = 10, 1766, 102, 4, 0 -object_12 = 1, 1948, 16, 8, 0 -object_13 = 10, 2108, 146, 8, 0 +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 # Terrain # id, xpos, ypos, modifier # modifier: 8=NO_OVERWRITE, 4=UPSIDE_DOWN, 2=REMOVE (combining allowed, 0=FULL) -terrain_0 = 1, 0, 106, 8 -terrain_1 = 1, 20, 108, 8 -terrain_2 = 1, 40, 112, 8 -terrain_3 = 1, 60, 118, 8 -terrain_4 = 1, 80, 126, 8 -terrain_5 = 1, 100, 136, 8 -terrain_6 = 1, 120, 148, 8 -terrain_7 = 1, 140, 146, 8 -terrain_8 = 1, 160, 142, 8 -terrain_9 = 1, 180, 136, 8 -terrain_10 = 1, 200, 128, 8 -terrain_11 = 1, 220, 118, 8 +terrain_0 = 1, 0, 106, 0 +terrain_1 = 1, 0, 110, 2 +terrain_2 = 1, 40, 106, 0 +terrain_3 = 1, 40, 110, 2 +terrain_4 = 1, 80, 106, 0 +terrain_5 = 1, 80, 110, 2 +terrain_6 = 1, 120, 106, 0 +terrain_7 = 1, 120, 110, 2 +terrain_8 = 1, 160, 106, 0 +terrain_9 = 1, 160, 110, 2 +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 = 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 = 21, 654, 132, 0 -terrain_60 = 1, 676, 148, 8 -terrain_61 = 1, 696, 150, 8 -terrain_62 = 1, 716, 154, 8 -terrain_63 = 1, 736, 160, 8 -terrain_64 = 1, 756, 168, 8 -terrain_65 = 1, 776, 178, 8 -terrain_66 = 1, 796, 190, 0 -terrain_67 = 1, 796, 194, 2 -terrain_68 = 1, 816, 190, 0 -terrain_69 = 1, 816, 194, 2 -terrain_70 = 1, 836, 190, 0 -terrain_71 = 1, 836, 194, 2 -terrain_72 = 1, 856, 190, 0 -terrain_73 = 1, 856, 194, 2 -terrain_74 = 1, 876, 190, 0 -terrain_75 = 1, 876, 194, 2 -terrain_76 = 1, 896, 190, 0 -terrain_77 = 1, 896, 194, 2 -terrain_78 = 1, 916, 190, 0 -terrain_79 = 1, 916, 194, 2 -terrain_80 = 1, 936, 190, 0 -terrain_81 = 1, 936, 194, 2 -terrain_82 = 1, 956, 190, 0 -terrain_83 = 1, 956, 194, 2 -terrain_84 = 21, 900, 174, 0 -terrain_84 = 1, 922, 106, 8 -terrain_85 = 1, 942, 108, 8 -terrain_86 = 1, 962, 112, 8 -terrain_87 = 1, 982, 118, 8 -terrain_88 = 1, 1002, 126, 8 -terrain_89 = 1, 1022, 136, 8 -terrain_90 = 1, 1042, 148, 0 -terrain_91 = 1, 1042, 152, 2 -terrain_92 = 1, 1062, 148, 0 -terrain_93 = 1, 1062, 152, 2 -terrain_94 = 1, 1082, 148, 0 -terrain_95 = 1, 1082, 152, 2 -terrain_96 = 1, 1102, 148, 0 -terrain_97 = 1, 1102, 152, 2 -terrain_98 = 1, 1122, 148, 0 -terrain_99 = 1, 1122, 152, 2 -terrain_100 = 1, 1142, 148, 0 -terrain_101 = 1, 1142, 152, 2 -terrain_102 = 1, 1162, 148, 0 -terrain_103 = 1, 1162, 152, 2 -terrain_104 = 1, 1182, 148, 0 -terrain_105 = 1, 1182, 152, 2 -terrain_106 = 1, 1202, 148, 0 -terrain_107 = 1, 1202, 152, 2 -terrain_108 = 1, 1222, 148, 0 -terrain_109 = 1, 1222, 152, 2 -terrain_110 = 1, 1242, 148, 0 -terrain_111 = 1, 1242, 152, 2 -terrain_112 = 1, 1262, 148, 0 -terrain_113 = 1, 1262, 152, 2 -terrain_114 = 1, 1282, 148, 0 -terrain_115 = 1, 1282, 152, 2 -terrain_116 = 1, 1302, 148, 0 -terrain_117 = 1, 1302, 152, 2 -terrain_118 = 21, 1242, 132, 0 -terrain_118 = 1, 1264, 148, 8 -terrain_119 = 1, 1284, 150, 8 -terrain_120 = 1, 1304, 154, 8 -terrain_121 = 1, 1324, 160, 8 -terrain_122 = 1, 1344, 168, 8 -terrain_123 = 1, 1364, 178, 8 -terrain_124 = 1, 1384, 190, 0 -terrain_125 = 1, 1384, 194, 2 -terrain_126 = 1, 1404, 190, 0 -terrain_127 = 1, 1404, 194, 2 -terrain_128 = 1, 1424, 190, 0 -terrain_129 = 1, 1424, 194, 2 -terrain_130 = 1, 1444, 190, 0 -terrain_131 = 1, 1444, 194, 2 -terrain_132 = 1, 1464, 190, 0 -terrain_133 = 1, 1464, 194, 2 -terrain_134 = 1, 1484, 190, 0 -terrain_135 = 1, 1484, 194, 2 -terrain_136 = 1, 1504, 190, 0 -terrain_137 = 1, 1504, 194, 2 -terrain_138 = 1, 1524, 190, 0 -terrain_139 = 1, 1524, 194, 2 -terrain_140 = 1, 1544, 190, 0 -terrain_141 = 1, 1544, 194, 2 -terrain_142 = 1, 1564, 190, 0 -terrain_143 = 1, 1564, 194, 2 -terrain_144 = 1, 1584, 190, 0 -terrain_145 = 1, 1584, 194, 2 -terrain_146 = 1, 1604, 190, 0 -terrain_147 = 1, 1604, 194, 2 -terrain_148 = 1, 1624, 190, 0 -terrain_149 = 1, 1624, 194, 2 -terrain_150 = 1, 1644, 190, 0 -terrain_151 = 1, 1644, 194, 2 -terrain_152 = 21, 1584, 174, 0 -terrain_152 = 1, 1606, 106, 8 -terrain_153 = 1, 1626, 108, 8 -terrain_154 = 1, 1646, 112, 8 -terrain_155 = 1, 1666, 118, 8 -terrain_156 = 1, 1686, 126, 8 -terrain_157 = 1, 1706, 136, 8 -terrain_158 = 1, 1726, 148, 0 -terrain_159 = 1, 1726, 152, 2 -terrain_160 = 1, 1746, 148, 0 -terrain_161 = 1, 1746, 152, 2 -terrain_162 = 1, 1766, 148, 0 -terrain_163 = 1, 1766, 152, 2 -terrain_164 = 1, 1786, 148, 0 -terrain_165 = 1, 1786, 152, 2 -terrain_166 = 1, 1806, 148, 0 -terrain_167 = 1, 1806, 152, 2 -terrain_168 = 1, 1826, 148, 0 -terrain_169 = 1, 1826, 152, 2 -terrain_170 = 1, 1846, 148, 0 -terrain_171 = 1, 1846, 152, 2 -terrain_172 = 1, 1866, 148, 0 -terrain_173 = 1, 1866, 152, 2 -terrain_174 = 1, 1886, 148, 0 -terrain_175 = 1, 1886, 152, 2 -terrain_176 = 1, 1906, 148, 0 -terrain_177 = 1, 1906, 152, 2 -terrain_178 = 1, 1926, 148, 0 -terrain_179 = 1, 1926, 152, 2 -terrain_180 = 1, 1946, 148, 0 -terrain_181 = 1, 1946, 152, 2 -terrain_182 = 1, 1966, 148, 0 -terrain_183 = 1, 1966, 152, 2 -terrain_184 = 1, 1986, 148, 0 -terrain_185 = 1, 1986, 152, 2 -terrain_186 = 21, 1926, 132, 0 -terrain_186 = 1, 1948, 148, 8 -terrain_187 = 1, 1968, 150, 8 -terrain_188 = 1, 1988, 154, 8 -terrain_189 = 1, 2008, 160, 8 -terrain_190 = 1, 2028, 168, 8 -terrain_191 = 1, 2048, 178, 8 -terrain_192 = 1, 2068, 190, 0 -terrain_193 = 1, 2068, 194, 2 -terrain_194 = 1, 2088, 190, 0 -terrain_195 = 1, 2088, 194, 2 -terrain_196 = 1, 2108, 190, 0 -terrain_197 = 1, 2108, 194, 2 -terrain_198 = 1, 2128, 190, 0 -terrain_199 = 1, 2128, 194, 2 -terrain_200 = 1, 2148, 190, 0 -terrain_201 = 1, 2148, 194, 2 -terrain_202 = 1, 2168, 190, 0 -terrain_203 = 1, 2168, 194, 2 -terrain_204 = 1, 2188, 190, 0 -terrain_205 = 1, 2188, 194, 2 -terrain_206 = 1, 2208, 190, 0 -terrain_207 = 1, 2208, 194, 2 -terrain_208 = 1, 2228, 190, 0 -terrain_209 = 1, 2228, 194, 2 -terrain_210 = 1, 2248, 190, 0 -terrain_211 = 1, 2248, 194, 2 -terrain_212 = 1, 2268, 190, 0 -terrain_213 = 1, 2268, 194, 2 -terrain_214 = 1, 2288, 190, 0 -terrain_215 = 1, 2288, 194, 2 -terrain_216 = 1, 2308, 190, 0 -terrain_217 = 1, 2308, 194, 2 -terrain_218 = 1, 2328, 190, 0 -terrain_219 = 1, 2328, 194, 2 -terrain_220 = 21, 2268, 174, 0 -name = Test fire(5) O(10) T(7) M(99) +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) diff --git a/src/graphic.c b/src/graphic.c index 802fd5d..a444819 100644 --- a/src/graphic.c +++ b/src/graphic.c @@ -265,3 +265,14 @@ int paintObject(struct gameObjectState *obj, SDL_Rect *srcRect, SDL_Surface *dst return 0; } +int refresh(SDL_Surface *tmpSurf, SDL_Rect *srcRect, SDL_Surface *screen, SDL_Rect dstRect) { + int res; + + res=SDL_BlitSurface(tmpSurf, srcRect, screen, &dstRect); + if ( res!=0 ) { + logs2(LOG_DEBUG, "refresh(), SDL_BlitSurface()", SDL_GetError()); + } + + SDL_UpdateRect(screen, dstRect.x, dstRect.y, dstRect.w, dstRect.h); + return res; +} diff --git a/src/include/graphic.h b/src/include/graphic.h index 7160b43..7d7761e 100644 --- a/src/include/graphic.h +++ b/src/include/graphic.h @@ -25,4 +25,5 @@ int repaint(gameObjectsState_t *objStates, gameGraphSurfaces_t *srcSurfs, SDL_Re int findAndZSortObjects(gameObjectsState_t *objectsStat, SDL_Rect *offsetRect, gameObjectsState_t *objectsFound); int paintObject(struct gameObjectState *obj, SDL_Rect *srcRect, SDL_Surface *dstSurf, SDL_Rect *dstRect); +int refresh(SDL_Surface *tmpSurf, SDL_Rect *srcRect, SDL_Surface *screen, SDL_Rect dstRect); #endif /*GRAPHIC_H*/ diff --git a/src/netlem.c b/src/netlem.c index 8b6b3da..a6d6c38 100644 --- a/src/netlem.c +++ b/src/netlem.c @@ -514,12 +514,13 @@ int updateGraphics(gameObjectsState_t *objStates, localParams_t *params, gameGra case eMultiGame: // If we had a camera movement, we have to refesh all the screen tmpSurf=gGraph->surfaces.tmpSurf; + SDL_FillRect(tmpSurf, &(tmpSurf->clip_rect), 0xcccccccc); if ( lastViewport.x != gGraph->viewport.x ) { lastViewport.x=gGraph->viewport.x; dstRect.x=0; dstRect.y=0; - dstRect.w=0; - dstRect.h=0; + // dstRect.w=0; + // dstRect.h=0; srcRect.x=lastViewport.x; srcRect.y=lastViewport.y; srcRect.w=gGraph->screen->clip_rect.w; @@ -528,6 +529,7 @@ int updateGraphics(gameObjectsState_t *objStates, localParams_t *params, gameGra if ( res != 0 ) { logs(LOG_WARN, "updateGraphics(), repaint() failed"); } + refresh(tmpSurf, &srcRect, gGraph->screen, dstRect); } else { // We use a dirty rectangle method for performance for(i=0; iobjCount; i++) { -- cgit v1.2.3