From db33e32b4dd58027f5d3bc8dd55792df7cf2158d Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 21 Jan 2010 01:44:51 +0000 Subject: (svn r18873) -Codechange: use PaletteID also in the blitter --- src/blitter/32bpp_anim.cpp | 2 +- src/blitter/32bpp_anim.hpp | 2 +- src/blitter/32bpp_base.hpp | 2 +- src/blitter/32bpp_simple.cpp | 2 +- src/blitter/32bpp_simple.hpp | 2 +- src/blitter/8bpp_base.cpp | 2 +- src/blitter/8bpp_base.hpp | 2 +- src/blitter/base.hpp | 2 +- src/blitter/null.hpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp index a119eac47..cc6dfa0bf 100644 --- a/src/blitter/32bpp_anim.cpp +++ b/src/blitter/32bpp_anim.cpp @@ -209,7 +209,7 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL } } -void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height, int pal) +void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) { if (_screen_disable_anim) { /* This means our output is not to the screen, so we can't be doing any animation stuff, so use our parent DrawColourMappingRect() */ diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.hpp index 51ad48ab4..ec38da003 100644 --- a/src/blitter/32bpp_anim.hpp +++ b/src/blitter/32bpp_anim.hpp @@ -28,7 +28,7 @@ public: {} /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); - /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, int pal); + /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal); /* virtual */ void SetPixel(void *video, int x, int y, uint8 colour); /* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 colour); /* virtual */ void DrawRect(void *video, int width, int height, uint8 colour); diff --git a/src/blitter/32bpp_base.hpp b/src/blitter/32bpp_base.hpp index 5967de578..ff7c37b5f 100644 --- a/src/blitter/32bpp_base.hpp +++ b/src/blitter/32bpp_base.hpp @@ -20,7 +20,7 @@ class Blitter_32bppBase : public Blitter { public: /* virtual */ uint8 GetScreenDepth() { return 32; } // /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); -// /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, int pal); +// /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal); // /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); /* virtual */ void *MoveTo(const void *video, int x, int y); /* virtual */ void SetPixel(void *video, int x, int y, uint8 colour); diff --git a/src/blitter/32bpp_simple.cpp b/src/blitter/32bpp_simple.cpp index d75f0a0d4..56309bbaa 100644 --- a/src/blitter/32bpp_simple.cpp +++ b/src/blitter/32bpp_simple.cpp @@ -63,7 +63,7 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo } } -void Blitter_32bppSimple::DrawColourMappingRect(void *dst, int width, int height, int pal) +void Blitter_32bppSimple::DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) { uint32 *udst = (uint32 *)dst; diff --git a/src/blitter/32bpp_simple.hpp b/src/blitter/32bpp_simple.hpp index 324220b01..18f646030 100644 --- a/src/blitter/32bpp_simple.hpp +++ b/src/blitter/32bpp_simple.hpp @@ -18,7 +18,7 @@ class Blitter_32bppSimple : public Blitter_32bppBase { public: /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); - /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, int pal); + /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal); /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); /* virtual */ const char *GetName() { return "32bpp-simple"; } diff --git a/src/blitter/8bpp_base.cpp b/src/blitter/8bpp_base.cpp index 354d0f648..c4035fe1f 100644 --- a/src/blitter/8bpp_base.cpp +++ b/src/blitter/8bpp_base.cpp @@ -13,7 +13,7 @@ #include "../gfx_func.h" #include "8bpp_base.hpp" -void Blitter_8bppBase::DrawColourMappingRect(void *dst, int width, int height, int pal) +void Blitter_8bppBase::DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) { const uint8 *ctab = GetNonSprite(pal, ST_RECOLOUR) + 1; diff --git a/src/blitter/8bpp_base.hpp b/src/blitter/8bpp_base.hpp index 4ab1b924c..2ed7681fe 100644 --- a/src/blitter/8bpp_base.hpp +++ b/src/blitter/8bpp_base.hpp @@ -18,7 +18,7 @@ class Blitter_8bppBase : public Blitter { public: /* virtual */ uint8 GetScreenDepth() { return 8; } // /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); - /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, int pal); + /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal); // /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); /* virtual */ void *MoveTo(const void *video, int x, int y); /* virtual */ void SetPixel(void *video, int x, int y, uint8 colour); diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp index c8973c542..62e2d8c2d 100644 --- a/src/blitter/base.hpp +++ b/src/blitter/base.hpp @@ -68,7 +68,7 @@ public: * @param height the height of the buffer. * @param pal the palette to use. */ - virtual void DrawColourMappingRect(void *dst, int width, int height, int pal) = 0; + virtual void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) = 0; /** * Convert a sprite from the loader to our own format. diff --git a/src/blitter/null.hpp b/src/blitter/null.hpp index 79361a487..71bca3319 100644 --- a/src/blitter/null.hpp +++ b/src/blitter/null.hpp @@ -19,7 +19,7 @@ class Blitter_Null : public Blitter { public: /* virtual */ uint8 GetScreenDepth() { return 0; } /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) {}; - /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, int pal) {}; + /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) {}; /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); /* virtual */ void *MoveTo(const void *video, int x, int y) { return NULL; }; /* virtual */ void SetPixel(void *video, int x, int y, uint8 colour) {}; -- cgit v1.2.3-54-g00ecf