--- a/src/blitter/8bpp_optimized.hpp	Tue Jun 12 19:52:26 2007 +0000
+++ b/src/blitter/8bpp_optimized.hpp	Sun Jun 17 21:31:00 2007 +0000
@@ -5,25 +5,19 @@
 #ifndef BLITTER_8BPP_OPTIMIZED_HPP
 #define BLITTER_8BPP_OPTIMIZED_HPP
 
-#include "blitter.hpp"
-
-typedef Pixel Pixel8;
+#include "8bpp_base.hpp"
+#include "factory.hpp"
 
-class Blitter_8bppOptimized : public Blitter {
+class Blitter_8bppOptimized : public Blitter_8bppBase {
 public:
-	uint8 GetScreenDepth() { return 8; }
-
-	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
-
-	Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
+	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
+	/* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
 };
 
 class FBlitter_8bppOptimized: public BlitterFactory<FBlitter_8bppOptimized> {
 public:
 	/* virtual */ const char *GetName() { return "8bpp-optimized"; }
-
 	/* virtual */ const char *GetDescription() { return "8bpp Optimized Blitter (compression + all-ZoomLevel cache)"; }
-
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_8bppOptimized(); }
 };