cpp/openttd-patchpack/source Changeset - r24028:c84c014df400

Changeset - r24028:c84c014df400

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Charles Pigott - 5 years ago 2020-01-05 23:05:28
charlespigott@googlemail.com

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

1 file changed with 7 insertions and 11 deletions:

src/screenshot.cpp

0 comments (0 inline, 0 general)

src/screenshot.cpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)