Fix drawing of transparent nodes without --drawalpha (fixes #41)

sfan5 · sfan5 · commit d490cf0a31b1 · 2017-01-05T23:37:21.000+01:00
diff --git a/Image.h b/Image.h
@@ -9,6 +9,8 @@ struct Color {
 	Color() : r(0), g(0), b(0), a(0) {};
 	Color(u8 r, u8 g, u8 b) : r(r), g(g), b(b), a(255) {};
 	Color(u8 r, u8 g, u8 b, u8 a) : r(r), g(g), b(b), a(a) {};
+	inline Color noAlpha() const { return Color(r, g, b); }
+
 	u8 r, g, b, a;
 };
 
diff --git a/TileGenerator.cpp b/TileGenerator.cpp
@@ -526,7 +526,7 @@ void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPos &pos,
 							continue;
 						}
 					} else {
-						setZoomed(imageX, imageY, c);
+						setZoomed(imageX, imageY, c.noAlpha());
 						m_readPixels[z] |= (1 << x);
 					}
 					if(!(m_readInfo[z] & (1 << x))) {

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPos &pos,`
`526`	`526`	`continue;`
`527`	`527`	`}`
`528`	`528`	`} else {`
`529`		`- setZoomed(imageX, imageY, c);`
	`529`	`+ setZoomed(imageX, imageY, c.noAlpha());`
`530`	`530`	`m_readPixels[z] \|= (1 << x);`
`531`	`531`	`}`
`532`	`532`	`if(!(m_readInfo[z] & (1 << x))) {`