summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-06-17 20:47:11 +0000
committertruelight <truelight@openttd.org>2007-06-17 20:47:11 +0000
commitcdf6192ce0cd1c5d7fa24c760f556ad16e86924f (patch)
treefbf34a543f97ced894ed1c4e12db6cd10f48dbe0
parent32406b0c186bca81ef2225685f552f32cb211258 (diff)
downloadopenttd-cdf6192ce0cd1c5d7fa24c760f556ad16e86924f.tar.xz
(svn r10193) -Fix r10190: somehow an other partly-patch was applied too
-rw-r--r--src/blitter/32bpp_base.cpp50
-rw-r--r--src/blitter/32bpp_base.hpp1
-rw-r--r--src/blitter/8bpp_base.cpp50
-rw-r--r--src/blitter/8bpp_base.hpp1
-rw-r--r--src/blitter/base.hpp5
-rw-r--r--src/blitter/null.hpp1
6 files changed, 0 insertions, 108 deletions
diff --git a/src/blitter/32bpp_base.cpp b/src/blitter/32bpp_base.cpp
index a3211a02a..3f02c0886 100644
--- a/src/blitter/32bpp_base.cpp
+++ b/src/blitter/32bpp_base.cpp
@@ -29,56 +29,6 @@ void Blitter_32bppBase::SetHorizontalLine(void *video, int width, uint8 color)
}
}
-void Blitter_32bppBase::DrawLine(void *video, int x, int y, int x2, int y2, uint8 color)
-{
- int dy;
- int dx;
- int stepx;
- int stepy;
- int frac;
-
- dy = (y2 - y) * 2;
- if (dy < 0) {
- dy = -dy;
- stepy = -1;
- } else {
- stepy = 1;
- }
-
- dx = (x2 - x) * 2;
- if (dx < 0) {
- dx = -dx;
- stepx = -1;
- } else {
- stepx = 1;
- }
-
- this->SetPixel(video, x, y, color);
- if (dx > dy) {
- frac = dy - (dx >> 1);
- while (x != x2) {
- if (frac >= 0) {
- y += stepy;
- frac -= dx;
- }
- x += stepx;
- frac += dy;
- this->SetPixel(video, x, y, color);
- }
- } else {
- frac = dx - (dy >> 1);
- while (y != y2) {
- if (frac >= 0) {
- x += stepx;
- frac -= dy;
- }
- y += stepy;
- frac += dx;
- this->SetPixel(video, x, y, color);
- }
- }
-}
-
void Blitter_32bppBase::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
{
int direction = (height < 0) ? -1 : 1;
diff --git a/src/blitter/32bpp_base.hpp b/src/blitter/32bpp_base.hpp
index 85ce07062..6ba6ac534 100644
--- a/src/blitter/32bpp_base.hpp
+++ b/src/blitter/32bpp_base.hpp
@@ -17,7 +17,6 @@ public:
/* virtual */ void SetPixel(void *video, int x, int y, uint8 color);
/* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 color);
/* virtual */ void SetHorizontalLine(void *video, int width, uint8 color);
- /* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, uint8 color);
/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch);
/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch);
/* virtual */ void MoveBuffer(void *video_dst, const void *video_src, int width, int height);
diff --git a/src/blitter/8bpp_base.cpp b/src/blitter/8bpp_base.cpp
index e745ee627..48ff3d547 100644
--- a/src/blitter/8bpp_base.cpp
+++ b/src/blitter/8bpp_base.cpp
@@ -33,56 +33,6 @@ void Blitter_8bppBase::SetHorizontalLine(void *video, int width, uint8 color)
memset(video, color, width);
}
-void Blitter_8bppBase::DrawLine(void *video, int x, int y, int x2, int y2, uint8 color)
-{
- int dy;
- int dx;
- int stepx;
- int stepy;
- int frac;
-
- dy = (y2 - y) * 2;
- if (dy < 0) {
- dy = -dy;
- stepy = -1;
- } else {
- stepy = 1;
- }
-
- dx = (x2 - x) * 2;
- if (dx < 0) {
- dx = -dx;
- stepx = -1;
- } else {
- stepx = 1;
- }
-
- 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;
- 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;
- this->SetPixel(video, x, y, color);
- }
- }
-}
-
void Blitter_8bppBase::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
{
int direction = (height < 0) ? -1 : 1;
diff --git a/src/blitter/8bpp_base.hpp b/src/blitter/8bpp_base.hpp
index 7ed862ca0..536a6c984 100644
--- a/src/blitter/8bpp_base.hpp
+++ b/src/blitter/8bpp_base.hpp
@@ -17,7 +17,6 @@ public:
/* virtual */ void SetPixel(void *video, int x, int y, uint8 color);
/* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 color);
/* virtual */ void SetHorizontalLine(void *video, int width, uint8 color);
- /* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, uint8 color);
/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch);
/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch);
/* virtual */ void MoveBuffer(void *video_dst, const void *video_src, int width, int height);
diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp
index 66550d42d..abc886a22 100644
--- a/src/blitter/base.hpp
+++ b/src/blitter/base.hpp
@@ -97,11 +97,6 @@ public:
virtual void SetHorizontalLine(void *video, int width, uint8 color) = 0;
/**
- * Draw a line in which ever direction.
- */
- virtual void DrawLine(void *video, int x, int y, int x2, int y2, uint8 color) = 0;
-
- /**
* Copy from a buffer to the screen.
* @param video The destionation pointer (video-buffer).
* @param src The buffer from which the data will be read.
diff --git a/src/blitter/null.hpp b/src/blitter/null.hpp
index 98374f1de..130855998 100644
--- a/src/blitter/null.hpp
+++ b/src/blitter/null.hpp
@@ -18,7 +18,6 @@ public:
/* virtual */ void SetPixel(void *video, int x, int y, uint8 color) {};
/* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 color) {};
/* virtual */ void SetHorizontalLine(void *video, int width, uint8 color) {};
- /* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, uint8 color) {};
/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch) {};
/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch) {};
/* virtual */ void MoveBuffer(void *video_dst, const void *video_src, int width, int height) {};