--- a/projects/openttd.vcproj	Mon Jun 11 14:45:26 2007 +0000
+++ b/projects/openttd.vcproj	Mon Jun 11 15:13:30 2007 +0000
@@ -974,10 +974,10 @@
 				RelativePath=".\..\src\blitter\8bpp_optimized.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\blitter\8bpp_slow.cpp">
+				RelativePath=".\..\src\blitter\8bpp_simple.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\blitter\8bpp_slow.hpp">
+				RelativePath=".\..\src\blitter\8bpp_simple.hpp">
 			</File>
 			<File
 				RelativePath=".\..\src\blitter\blitter.hpp">

--- a/projects/openttd_vs80.vcproj	Mon Jun 11 14:45:26 2007 +0000
+++ b/projects/openttd_vs80.vcproj	Mon Jun 11 15:13:30 2007 +0000
@@ -1520,11 +1520,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\blitter\8bpp_slow.cpp"
+				RelativePath=".\..\src\blitter\8bpp_simple.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\blitter\8bpp_slow.hpp"
+				RelativePath=".\..\src\blitter\8bpp_simple.hpp"
 				>
 			</File>
 			<File

--- a/source.list	Mon Jun 11 14:45:26 2007 +0000
+++ b/source.list	Mon Jun 11 15:13:30 2007 +0000
@@ -295,8 +295,8 @@
 blitter/8bpp_debug.hpp
 blitter/8bpp_optimized.cpp
 blitter/8bpp_optimized.hpp
-blitter/8bpp_slow.cpp
-blitter/8bpp_slow.hpp
+blitter/8bpp_simple.cpp
+blitter/8bpp_simple.hpp
 blitter/blitter.hpp
 
 # Sprite loaders

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/blitter/8bpp_simple.cpp	Mon Jun 11 15:13:30 2007 +0000
@@ -0,0 +1,63 @@
+#include "../stdafx.h"
+#include "../zoom.hpp"
+#include "../gfx.h"
+#include "8bpp_simple.hpp"
+
+static FBlitter_8bppSimple iFBlitter_8bppSimple;
+
+void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
+{
+	const byte *src, *src_line;
+	Pixel8 *dst, *dst_line;
+
+	/* Find where to start reading in the source sprite */
+	src_line = (const byte *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom);
+	dst_line = (Pixel8 *)bp->dst + bp->top * bp->pitch + bp->left;
+
+	for (int y = 0; y < bp->height; y++) {
+		dst = dst_line;
+		dst_line += bp->pitch;
+
+		src = src_line;
+		src_line += bp->sprite_width * ScaleByZoom(1, zoom);
+
+		for (int x = 0; x < bp->width; x++) {
+			uint color = 0;
+
+			switch (mode) {
+				case BM_COLOUR_REMAP:
+					color = bp->remap[*src];
+					break;
+
+				case BM_TRANSPARENT:
+					if (*src != 0) color = bp->remap[*dst];
+					break;
+
+				default:
+					color = *src;
+					break;
+			}
+			if (color != 0) *dst = color;
+			dst++;
+			src += ScaleByZoom(1, zoom);
+		}
+	}
+}
+
+Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
+{
+	Sprite *dest_sprite;
+	dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);;
+
+	dest_sprite->height = sprite->height;
+	dest_sprite->width  = sprite->width;
+	dest_sprite->x_offs = sprite->x_offs;
+	dest_sprite->y_offs = sprite->y_offs;
+
+	/* Copy over only the 'remap' channel, as that is what we care about in 8bpp */
+	for (int i = 0; i < sprite->height * sprite->width; i++) {
+		dest_sprite->data[i] = sprite->data[i].m;
+	}
+
+	return dest_sprite;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/blitter/8bpp_simple.hpp	Mon Jun 11 15:13:30 2007 +0000
@@ -0,0 +1,30 @@
+/* $Id$ */
+
+/** @file 8bpp.hpp */
+
+#ifndef BLITTER_8BPP_SIMPLE_HPP
+#define BLITTER_8BPP_SIMPLE_HPP
+
+#include "blitter.hpp"
+
+typedef Pixel Pixel8;
+
+class Blitter_8bppSimple : public Blitter {
+public:
+	uint8 GetScreenDepth() { return 8; }
+
+	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
+
+	Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
+};
+
+class FBlitter_8bppSimple: public BlitterFactory<FBlitter_8bppSimple> {
+public:
+	/* virtual */ const char *GetName() { return "8bpp-simple"; }
+
+	/* virtual */ const char *GetDescription() { return "8bpp Simple Blitter (relative slow, but never wrong)"; }
+
+	/* virtual */ Blitter *CreateInstance() { return new Blitter_8bppSimple(); }
+};
+
+#endif /* BLITTER_8BPP_SIMPLE_HPP */

--- a/src/blitter/8bpp_slow.cpp	Mon Jun 11 14:45:26 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#include "../stdafx.h"
-#include "../zoom.hpp"
-#include "../gfx.h"
-#include "8bpp_slow.hpp"
-
-static FBlitter_8bppSimple iFBlitter_8bppSimple;
-
-void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
-{
-	const byte *src, *src_line;
-	Pixel8 *dst, *dst_line;
-
-	/* Find where to start reading in the source sprite */
-	src_line = (const byte *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom);
-	dst_line = (Pixel8 *)bp->dst + bp->top * bp->pitch + bp->left;
-
-	for (int y = 0; y < bp->height; y++) {
-		dst = dst_line;
-		dst_line += bp->pitch;
-
-		src = src_line;
-		src_line += bp->sprite_width * ScaleByZoom(1, zoom);
-
-		for (int x = 0; x < bp->width; x++) {
-			uint color = 0;
-
-			switch (mode) {
-				case BM_COLOUR_REMAP:
-					color = bp->remap[*src];
-					break;
-
-				case BM_TRANSPARENT:
-					if (*src != 0) color = bp->remap[*dst];
-					break;
-
-				default:
-					color = *src;
-					break;
-			}
-			if (color != 0) *dst = color;
-			dst++;
-			src += ScaleByZoom(1, zoom);
-		}
-	}
-}
-
-Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
-{
-	Sprite *dest_sprite;
-	dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);;
-
-	dest_sprite->height = sprite->height;
-	dest_sprite->width  = sprite->width;
-	dest_sprite->x_offs = sprite->x_offs;
-	dest_sprite->y_offs = sprite->y_offs;
-
-	/* Copy over only the 'remap' channel, as that is what we care about in 8bpp */
-	for (int i = 0; i < sprite->height * sprite->width; i++) {
-		dest_sprite->data[i] = sprite->data[i].m;
-	}
-
-	return dest_sprite;
-}

--- a/src/blitter/8bpp_slow.hpp	Mon Jun 11 14:45:26 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/* $Id$ */
-
-/** @file 8bpp.hpp */
-
-#ifndef BLITTER_8BPP_SIMPLE_HPP
-#define BLITTER_8BPP_SIMPLE_HPP
-
-#include "blitter.hpp"
-
-typedef Pixel Pixel8;
-
-class Blitter_8bppSimple : public Blitter {
-public:
-	uint8 GetScreenDepth() { return 8; }
-
-	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
-
-	Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
-};
-
-class FBlitter_8bppSimple: public BlitterFactory<FBlitter_8bppSimple> {
-public:
-	/* virtual */ const char *GetName() { return "8bpp-simple"; }
-
-	/* virtual */ const char *GetDescription() { return "8bpp Simple Blitter (relative slow, but never wrong)"; }
-
-	/* virtual */ Blitter *CreateInstance() { return new Blitter_8bppSimple(); }
-};
-
-#endif /* BLITTER_8BPP_SIMPLE_HPP */