cpp/openttd-patchpack/source Changeset - r7638:1d77b4c32fe9

Changeset - r7638:1d77b4c32fe9

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 17 years ago 2007-09-26 14:17:26
rubidium@openttd.org

(svn r11169) -Fix [FS#1255]: obiwan in Blitter::Drawline(), which caused it to clip too much at screen/viewport borders. Patch by frosch.

2 files changed with 6 insertions and 6 deletions:

src/blitter/32bpp_base.cpp

src/blitter/8bpp_base.cpp

0 comments (0 inline, 0 general)

src/blitter/32bpp_base.cpp

➞

Show inline comments

@@ @@ -53,34 +53,34 @@ void Blitter_32bppBase::DrawLine(void *v @@
 		dx = -dx;
 		stepx = -1;
 	} else {
 		stepx = 1;
+	}
 	if (x > 0 && y > 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+	if (x >= 0 && y >= 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
 	if (dx > dy) {
 		frac = dy - (dx / 2);
 		while (x != x2) {
 			if (frac >= 0) {
 				y += stepy;
 				frac -= dx;
+			}
 			x += stepx;
 			frac += dy;
 			if (x > 0 && y > 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+			if (x >= 0 && y >= 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+		}
 	} else {
 		frac = dx - (dy / 2);
 		while (y != y2) {
 			if (frac >= 0) {
 				x += stepx;
 				frac -= dy;
+			}
 			y += stepy;
 			frac += dx;
 			if (x > 0 && y > 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+			if (x >= 0 && y >= 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+		}
+	}
+}
 void Blitter_32bppBase::CopyFromBuffer(void *video, const void *src, int width, int height)
+{

src/blitter/8bpp_base.cpp

➞

Show inline comments

@@ @@ -57,34 +57,34 @@ void Blitter_8bppBase::DrawLine(void *vi @@
 		dx = -dx;
 		stepx = -1;
 	} else {
 		stepx = 1;
+	}
 	if (x > 0 && y > 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+	if (x >= 0 && y >= 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
 	if (dx > dy) {
 		frac = dy - (dx / 2);
 		while (x != x2) {
 			if (frac >= 0) {
 				y += stepy;
 				frac -= dx;
+			}
 			x += stepx;
 			frac += dy;
 			if (x > 0 && y > 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+			if (x >= 0 && y >= 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+		}
 	} else {
 		frac = dx - (dy / 2);
 		while (y != y2) {
 			if (frac >= 0) {
 				x += stepx;
 				frac -= dy;
+			}
 			y += stepy;
 			frac += dx;
 			if (x > 0 && y > 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+			if (x >= 0 && y >= 0 && x < screen_width && y < screen_height) this->SetPixel(video, x, y, color);
+		}
+	}
+}
 void Blitter_8bppBase::CopyFromBuffer(void *video, const void *src, int width, int height)
+{

0 comments (0 inline, 0 general)