cpp/openttd-patchpack/source Changeset - r20776:d61a8f63e17a

Changeset - r20776:d61a8f63e17a

Parent rev.

Child rev.

[Not reviewed]

master

0 11 0

frosch - 11 years ago 2013-10-06 19:38:36
frosch@openttd.org

(svn r25820) -Codechange: More const-ness.

11 files changed with 11 insertions and 11 deletions:

src/blitter/32bpp_optimized.cpp

src/blitter/32bpp_optimized.hpp

src/blitter/32bpp_simple.cpp

src/blitter/32bpp_simple.hpp

src/blitter/8bpp_optimized.cpp

src/blitter/8bpp_optimized.hpp

src/blitter/8bpp_simple.cpp

src/blitter/8bpp_simple.hpp

src/blitter/base.hpp

src/blitter/null.cpp

src/blitter/null.hpp

0 comments (0 inline, 0 general)

src/blitter/32bpp_optimized.cpp

➞

Show inline comments

@@ @@ -204,13 +204,13 @@ void Blitter_32bppOptimized::Draw(Blitte @@
 		case BM_NORMAL:       Draw<BM_NORMAL>      (bp, zoom); return;
 		case BM_COLOUR_REMAP: Draw<BM_COLOUR_REMAP>(bp, zoom); return;
 		case BM_TRANSPARENT:  Draw<BM_TRANSPARENT> (bp, zoom); return;
+	}
+}
 Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+Sprite *Blitter_32bppOptimized::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+{
 	/* streams of pixels (a, r, g, b channels)
+	 *
 	 * stored in separated stream so data are always aligned on 4B boundary */
 	Colour *dst_px_orig[ZOOM_LVL_COUNT];

src/blitter/32bpp_optimized.hpp

➞

Show inline comments

@@ @@ -21,13 +21,13 @@ public: @@
 	struct SpriteData {
 		uint32 offset[ZOOM_LVL_COUNT][2]; ///< Offsets (from .data) to streams for different zoom levels, and the normal and remap image information.
 		byte data[];                      ///< Data, all zoomlevels.
 	};
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
+	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "32bpp-optimized"; }
 	template <BlitterMode mode> void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
 };

src/blitter/32bpp_simple.cpp

➞

Show inline comments

@@ @@ -89,13 +89,13 @@ void Blitter_32bppSimple::DrawColourMapp @@
 		return;
+	}
 	DEBUG(misc, 0, "32bpp blitter doesn't know how to draw this colour table ('%d')", pal);
+}
 Sprite *Blitter_32bppSimple::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+Sprite *Blitter_32bppSimple::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+{
 	Blitter_32bppSimple::Pixel *dst;
 	Sprite *dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width * sizeof(*dst));
 	dest_sprite->height = sprite->height;
 	dest_sprite->width  = sprite->width;

src/blitter/32bpp_simple.hpp

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ class Blitter_32bppSimple : public Blitt @@
 		uint8 m;  ///< Remap-channel
 		uint8 v;  ///< Brightness-channel
 	};
 public:
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
 	/* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
+	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "32bpp-simple"; }
 };
 /** Factory for the simple 32 bpp blitter. */
 class FBlitter_32bppSimple: public BlitterFactory<FBlitter_32bppSimple> {

src/blitter/8bpp_optimized.cpp

➞

Show inline comments

@@ @@ -109,13 +109,13 @@ void Blitter_8bppOptimized::Draw(Blitter @@
 					break;
+			}
+		}
+	}
+}
 Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+{
 	/* Make memory for all zoom-levels */
 	uint memory = sizeof(SpriteData);
 	ZoomLevel zoom_min;
 	ZoomLevel zoom_max;

src/blitter/8bpp_optimized.hpp

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ public: @@
 	struct SpriteData {
 		uint32 offset[ZOOM_LVL_COUNT]; ///< Offsets (from .data) to streams for different zoom levels.
 		byte data[];                   ///< Data, all zoomlevels.
 	};
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
+	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "8bpp-optimized"; }
 };
 /** Factory for the 8bpp blitter optimised for speed. */
 class FBlitter_8bppOptimized: public BlitterFactory<FBlitter_8bppOptimized> {

src/blitter/8bpp_simple.cpp

➞

Show inline comments

@@ @@ -52,13 +52,13 @@ void Blitter_8bppSimple::Draw(Blitter::B @@
 			dst++;
 			src += ScaleByZoom(1, zoom);
+		}
+	}
+}
 Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+Sprite *Blitter_8bppSimple::Encode(const SpriteLoader::Sprite *sprite, 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;

src/blitter/8bpp_simple.hpp

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
 #include "factory.hpp"
 /** Most trivial 8bpp blitter. */
 class Blitter_8bppSimple FINAL : public Blitter_8bppBase {
 public:
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
+	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "8bpp-simple"; }
 };
 /** Factory for the most trivial 8bpp blitter. */
 class FBlitter_8bppSimple: public BlitterFactory<FBlitter_8bppSimple> {

src/blitter/base.hpp

➞

Show inline comments

@@ @@ -74,13 +74,13 @@ public: @@
 	 */
 	virtual void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) = 0;
 	/**
 	 * Convert a sprite from the loader to our own format.
 	 */
 	virtual Sprite *Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator) = 0;
+	virtual Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator) = 0;
 	/**
 	 * Move the destination pointer the requested amount x and y, keeping in mind
 	 *  any pitch and bpp of the renderer.
 	 * @param video The destination pointer (video-buffer) to scroll.
 	 * @param x How much you want to scroll to the right.

src/blitter/null.cpp

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #include "../stdafx.h"
 #include "null.hpp"
 /** Instantiation of the null blitter factory. */
 static FBlitter_Null iFBlitter_Null;
 Sprite *Blitter_Null::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+Sprite *Blitter_Null::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
+{
 	Sprite *dest_sprite;
 	dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite));
 	dest_sprite->height = sprite->height;
 	dest_sprite->width  = sprite->width;

src/blitter/null.hpp

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ @@
 /** Blitter that does nothing. */
 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, PaletteID pal) {};
 	/* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
+	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ void *MoveTo(void *video, int x, int y) { return NULL; };
 	/* virtual */ void SetPixel(void *video, int x, int y, uint8 colour) {};
 	/* virtual */ void DrawRect(void *video, int width, int height, uint8 colour) {};
 	/* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width) {};
 	/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height) {};
 	/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height) {};

0 comments (0 inline, 0 general)