Mercurial > hg > openttd
changeset 7638:97258280a33d draft
(svn r11169) -Fix [FS#1255]: obiwan in Blitter::Drawline(), which caused it to clip too much at screen/viewport borders. Patch by frosch.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Wed, 26 Sep 2007 14:17:26 +0000 |
parents | bc29bd7b68c3 |
children | 0a10e434e5bb |
files | src/blitter/32bpp_base.cpp src/blitter/8bpp_base.cpp |
diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/blitter/32bpp_base.cpp +++ b/src/blitter/32bpp_base.cpp @@ -56,7 +56,7 @@ 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) { @@ -66,7 +66,7 @@ } 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); @@ -77,7 +77,7 @@ } 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); } } }
--- a/src/blitter/8bpp_base.cpp +++ b/src/blitter/8bpp_base.cpp @@ -60,7 +60,7 @@ 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) { @@ -70,7 +70,7 @@ } 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); @@ -81,7 +81,7 @@ } 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); } } }