From fd559171b4ab5ce09b67aa8c4e9f2d0482a09558 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 15 Dec 2011 22:02:00 +0000 Subject: (svn r23527) -Codechange: unify colo(u)r as far as it goes --- src/spriteloader/png.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/spriteloader/png.cpp') diff --git a/src/spriteloader/png.cpp b/src/spriteloader/png.cpp index abc9592e0..43301616b 100644 --- a/src/spriteloader/png.cpp +++ b/src/spriteloader/png.cpp @@ -191,8 +191,8 @@ static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 i dst[x].b = 0; /* Alpha channel is used from the original image (to allow transparency in remap colours) */ extern const byte _palmap_w2d[]; - byte color = row_pointer[x * sizeof(uint8)]; - dst[x].m = win_palette ? _palmap_w2d[color] : color; + byte colour = row_pointer[x * sizeof(uint8)]; + dst[x].m = win_palette ? _palmap_w2d[colour] : colour; } } else { dst[x].r = row_pointer[x * sizeof(uint32) + 0]; -- cgit v1.2.3-54-g00ecf