diff options
| author | rubidium <rubidium@openttd.org> | 2011-12-15 22:02:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-12-15 22:02:00 +0000 |
| commit | fd559171b4ab5ce09b67aa8c4e9f2d0482a09558 (patch) | |
| tree | 35469dedc14339858551f1c80ea4e049fc90d9f8 /src/spriteloader | |
| parent | 3d88c74389ec978bb198415816364898963bb979 (diff) | |
| download | openttd-fd559171b4ab5ce09b67aa8c4e9f2d0482a09558.tar.xz | |
(svn r23527) -Codechange: unify colo(u)r as far as it goes
Diffstat (limited to 'src/spriteloader')
| -rw-r--r-- | src/spriteloader/png.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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]; |