cpp/openttd-patchpack/source File Diff

File diff r4521:1a93f2cee8d3 → r4522:0df6e945fa63

gfx.c

➞

Show inline comments

@@ @@ -190,7 +190,7 @@ void GfxDrawLine(int x, int y, int x2, i @@
 	// Check clipping first
+	{
-		const DrawPixelInfo *dpi = _cur_dpi;
 		DrawPixelInfo *dpi = _cur_dpi;
 		int t;
 		if (x < dpi->left && x2 < dpi->left) return;
@@ @@ -560,7 +560,7 @@ int GetStringWidth(const char *str) @@
 int DoDrawString(const char *string, int x, int y, uint16 real_color)
+{
-	const DrawPixelInfo *dpi = _cur_dpi;
 	DrawPixelInfo *dpi = _cur_dpi;
 	FontSize size = _cur_fontsize;
 	byte c;
 	byte color;
@@ @@ -753,47 +753,6 @@ static void GfxBlitTileZoomIn(BlitterPar @@
 			break;
 		default:
 #if 0
 			src = src_o;
 			do {
 				int offs = bp->start_x;
 				dst = bp->dst;
 				for (src = src_o;; src += num + 2) {
 					skip = src[1];
 					if (skip >= offs) {
 						dst += skip;
 						break;
+					}
 					offs -= skip;
 					done = src[0];
 					num = done & 0x7F;
 					if (num > offs) {
 						src += offs;
 						dst += offs;
 						num -= offs;
 						break;
+					}
+				}
 				src += 2;
 				for (;;) {
 					do {
 						*dst++ = *src++;
 					} while (--num != 0);
 					if (done & 0x80) break;
 					done = *src++;
 					num = done & 0x7F;
 					dst += *src++;
+				}
 				bp->dst += bp->pitch;
 			} while (--bp->height != 0);
 #else
 			do {
 				do {
 					done = src_o[0];
@@ @@ -835,7 +794,6 @@ static void GfxBlitTileZoomIn(BlitterPar @@
 				bp->dst += bp->pitch;
 			} while (--bp->height != 0);
 #endif
 			break;
+	}
+}