cpp/openttd-patchpack/source Changeset - r6940:606207724b9b

Changeset - r6940:606207724b9b

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

truelight - 17 years ago 2007-06-17 20:47:11
truelight@openttd.org

(svn r10193) -Fix r10190: somehow an other partly-patch was applied too

6 files changed with 0 insertions and 108 deletions:

src/blitter/32bpp_base.cpp

src/blitter/32bpp_base.hpp

src/blitter/8bpp_base.cpp

src/blitter/8bpp_base.hpp

src/blitter/base.hpp

src/blitter/null.hpp

0 comments (0 inline, 0 general)

src/blitter/32bpp_base.cpp

➞

Show inline comments

@@ @@ -29,56 +29,6 @@ void Blitter_32bppBase::SetHorizontalLin @@
+	}
+}
 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;

src/blitter/32bpp_base.hpp

➞

Show inline comments

@@ @@ -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);

src/blitter/8bpp_base.cpp

➞

Show inline comments

@@ @@ -33,56 +33,6 @@ void Blitter_8bppBase::SetHorizontalLine @@
 	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;

src/blitter/8bpp_base.hpp

➞

Show inline comments

@@ @@ -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);

src/blitter/base.hpp

➞

Show inline comments

@@ @@ -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.

src/blitter/null.hpp

➞

Show inline comments

@@ @@ -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) {};

0 comments (0 inline, 0 general)