1 files changed, 21 insertions, 6 deletions

diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
index 1020e35f5..6efdb5f2e 100644
--- a/src/client/mapblock_mesh.cpp
+++ b/src/client/mapblock_mesh.cpp
@@ -116,7 +116,7 @@ void MeshMakeData::setCrack(int crack_level, v3s16 crack_pos)
 
 void MeshMakeData::setSmoothLighting(bool smooth_lighting)
 {
-	m_smooth_lighting = smooth_lighting;
+	m_smooth_lighting = smooth_lighting && ! g_settings->getBool("fullbright");
 }
 
 /*
@@ -133,6 +133,8 @@ static u8 getInteriorLight(enum LightBank bank, MapNode n, s32 increment,
 	u8 light = n.getLight(bank, ndef);
 	if (light > 0)
 		light = rangelim(light + increment, 0, LIGHT_SUN);
+	if(g_settings->getBool("fullbright"))
+		return 255;
 	return decode_light(light);
 }
 
@@ -167,7 +169,8 @@ static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2,
 			ndef->get(n2).light_source);
 	if(light_source > light)
 		light = light_source;
-
+	if(g_settings->getBool("fullbright"))
+		return 255;
 	return decode_light(light);
 }
 
@@ -676,6 +679,7 @@ static u8 face_contents(content_t m1, content_t m2, bool *equivalent,
 	u8 c1 = f1.solidness;
 	u8 c2 = f2.solidness;
 
+
 	if (c1 == c2)
 		return 0;
 
@@ -684,6 +688,7 @@ static u8 face_contents(content_t m1, content_t m2, bool *equivalent,
 	else if (c2 == 0)
 		c2 = f2.visual_solidness;
 
+
 	if (c1 == c2) {
 		*equivalent = true;
 		// If same solidness, liquid takes precense
@@ -800,25 +805,35 @@ static void getTileInfo(
 	VoxelManipulator &vmanip = data->m_vmanip;
 	const NodeDefManager *ndef = data->m_client->ndef();
 	v3s16 blockpos_nodes = data->m_blockpos * MAP_BLOCKSIZE;
-
+	content_t cXray = ndef->getId(g_settings->get("xray_node"));
+	bool xray = g_settings->getBool("xray");
+	
 	const MapNode &n0 = vmanip.getNodeRefUnsafe(blockpos_nodes + p);
 
+	content_t c0 = n0.getContent();
+	if (xray && c0 == cXray)
+		c0 = CONTENT_AIR;
+
 	// Don't even try to get n1 if n0 is already CONTENT_IGNORE
-	if (n0.getContent() == CONTENT_IGNORE) {
+	if (c0 == CONTENT_IGNORE) {
 		makes_face = false;
 		return;
 	}
 
 	const MapNode &n1 = vmanip.getNodeRefUnsafeCheckFlags(blockpos_nodes + p + face_dir);
 
-	if (n1.getContent() == CONTENT_IGNORE) {
+	content_t c1 = n1.getContent();
+	if (xray && c1 == cXray)
+		c1 = CONTENT_AIR;
+
+	if (c1 == CONTENT_IGNORE) {
 		makes_face = false;
 		return;
 	}
 
 	// This is hackish
 	bool equivalent = false;
-	u8 mf = face_contents(n0.getContent(), n1.getContent(),
+	u8 mf = face_contents(c0, c1,
 			&equivalent, ndef);
 
 	if (mf == 0) {