summaryrefslogtreecommitdiff
path: root/src/blitter/8bpp_simple.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-02-09 02:57:15 +0000
committerrubidium <rubidium@openttd.org>2009-02-09 02:57:15 +0000
commitc0a8d09ca72873bbbef14dd317cbd29319e54640 (patch)
tree211b57e3a81eed5791f5b6b9709252af6f7d8503 /src/blitter/8bpp_simple.cpp
parent90e2465d7d2c770707feeaebfebbe56bd76383f1 (diff)
downloadopenttd-c0a8d09ca72873bbbef14dd317cbd29319e54640.tar.xz
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
Diffstat (limited to 'src/blitter/8bpp_simple.cpp')
-rw-r--r--src/blitter/8bpp_simple.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp
index 5bef7927f..ec9c647b6 100644
--- a/src/blitter/8bpp_simple.cpp
+++ b/src/blitter/8bpp_simple.cpp
@@ -25,22 +25,22 @@ void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoom
src_line += bp->sprite_width * ScaleByZoom(1, zoom);
for (int x = 0; x < bp->width; x++) {
- uint color = 0;
+ uint colour = 0;
switch (mode) {
case BM_COLOUR_REMAP:
- color = bp->remap[*src];
+ colour = bp->remap[*src];
break;
case BM_TRANSPARENT:
- if (*src != 0) color = bp->remap[*dst];
+ if (*src != 0) colour = bp->remap[*dst];
break;
default:
- color = *src;
+ colour = *src;
break;
}
- if (color != 0) *dst = color;
+ if (colour != 0) *dst = colour;
dst++;
src += ScaleByZoom(1, zoom);
}