mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix e558aa8: Compiler warning about unused value (and move some variable declarations to where they're used)

pull/7909/head
Charles Pigott 2020-01-05 23:05:28 +00:00
parent 39e6247bec
commit 5b52f25902
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/screenshot.cpp
View File

@ -893,12 +893,8 @@ static Owner GetMinimapOwner(TileIndex tile)
static void MinimapScreenCallback(void *userdata, void *buf, uint y, uint pitch, uint n) static void MinimapScreenCallback(void *userdata, void *buf, uint y, uint pitch, uint n)
{ {
uint32 *ubuf;
uint num, row, col;
byte val;
byte owner_colours[OWNER_END + 1];
/* Fill with the company colours */ /* Fill with the company colours */
byte owner_colours[OWNER_END + 1];
for (const Company *c : Company::Iterate()) { for (const Company *c : Company::Iterate()) {
owner_colours[c->index] = MKCOLOUR(_colour_gradient[c->colour][5]); owner_colours[c->index] = MKCOLOUR(_colour_gradient[c->colour][5]);
} }
@ -910,15 +906,15 @@ static void MinimapScreenCallback(void *userdata, void *buf, uint y, uint pitch,
owner_colours[OWNER_DEITY] = PC_DARK_GREY; // industry owner_colours[OWNER_DEITY] = PC_DARK_GREY; // industry
owner_colours[OWNER_END] = PC_BLACK; owner_colours[OWNER_END] = PC_BLACK;
ubuf = (uint32 *)buf; uint32 *ubuf = (uint32 *)buf;
num = (pitch * n); uint num = (pitch * n);
for (uint i = 0; i < num; i++) { for (uint i = 0; i < num; i++) {
row = y + (int)(i / pitch); uint row = y + (int)(i / pitch);
col = (MapSizeX() - 1) - (i % pitch); uint col = (MapSizeX() - 1) - (i % pitch);
TileIndex tile = TileXY(col, row); TileIndex tile = TileXY(col, row);
Owner o = GetMinimapOwner(tile); Owner o = GetMinimapOwner(tile);
val = owner_colours[o]; byte val = owner_colours[o];
uint32 colour_buf = 0; uint32 colour_buf = 0;
colour_buf = (_cur_palette.palette[val].b << 0); colour_buf = (_cur_palette.palette[val].b << 0);
@ -926,7 +922,7 @@ static void MinimapScreenCallback(void *userdata, void *buf, uint y, uint pitch,
colour_buf |= (_cur_palette.palette[val].r << 16); colour_buf |= (_cur_palette.palette[val].r << 16);
*ubuf = colour_buf; *ubuf = colour_buf;
*ubuf++; // Skip alpha ubuf++; // Skip alpha
} }
} }