Make m_media_fetch_threads to contain MediaFetchThread* instead of MediaFetchThread

[minetest.git] / src / content_mapblock.cpp

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index ad819e7939e9669853f44db449a339a06e40e4c3..aa3c061d6c6d7afe1df2ff0f5517c9872f312188 100644 (file)
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tile.h"
 #include "gamedef.h"
 #include "util/numeric.h"
-#include "util/serialize.h"
 #include "util/directiontables.h"
 
 // Create a cuboid.
@@ -172,7 +171,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                continue;
 
                        u16 l = getInteriorLight(n, 0, data);
-                       video::SColor c = MapBlock_LightColor(f.alpha, l);
+                       video::SColor c = MapBlock_LightColor(f.alpha, l, decode_light(f.light_source));
                        
                        video::S3DVertex vertices[4] =
                        {
@@ -227,7 +226,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        // Otherwise use the light of this node (the liquid)
                        else
                                l = getInteriorLight(n, 0, data);
-                       video::SColor c = MapBlock_LightColor(f.alpha, l);
+                       video::SColor c = MapBlock_LightColor(f.alpha, l, decode_light(f.light_source));
                        
                        // Neighbor liquid levels (key = relative position)
                        // Includes current node
@@ -492,15 +491,15 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                // -Z towards +Z, thus the direction is +Z.
                                // Rotate texture to make animation go in flow direction
                                // Positive if liquid moves towards +Z
-                               int dz = (corner_levels[side_corners[2][0]] +
-                                               corner_levels[side_corners[2][1]] <
-                                               corner_levels[side_corners[3][0]] +
-                                               corner_levels[side_corners[3][1]]);
+                               int dz = (corner_levels[side_corners[3][0]] +
+                                               corner_levels[side_corners[3][1]]) -
+                                               (corner_levels[side_corners[2][0]] +
+                                               corner_levels[side_corners[2][1]]);
                                // Positive if liquid moves towards +X
-                               int dx = (corner_levels[side_corners[0][0]] +
-                                               corner_levels[side_corners[0][1]] <
-                                               corner_levels[side_corners[1][0]] +
-                                               corner_levels[side_corners[1][1]]);
+                               int dx = (corner_levels[side_corners[1][0]] +
+                                               corner_levels[side_corners[1][1]]) -
+                                               (corner_levels[side_corners[0][0]] +
+                                               corner_levels[side_corners[0][1]]);
                                // -X
                                if(-dx >= abs(dz))
                                {
@@ -545,7 +544,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        AtlasPointer ap = tile.texture;
 
                        u16 l = getInteriorLight(n, 1, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        for(u32 j=0; j<6; j++)
                        {
@@ -605,7 +604,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        AtlasPointer pa_leaves = tile_leaves.texture;
 
                        u16 l = getInteriorLight(n, 1, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        v3f pos = intToFloat(p, BS);
                        aabb3f box(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2);
@@ -639,7 +638,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 
                        AtlasPointer ap = tile.texture;
 
-                       video::SColor c(255,255,255,255);
+                       u16 l = getInteriorLight(n, 1, data);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        // Wall at X+ of node
                        video::S3DVertex vertices[4] =
@@ -684,7 +684,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        AtlasPointer ap = tile.texture;
 
                        u16 l = getInteriorLight(n, 0, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
                                
                        float d = (float)BS/16;
                        // Wall at X+ of node
@@ -731,7 +731,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        AtlasPointer ap = tile.texture;
                        
                        u16 l = getInteriorLight(n, 1, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        for(u32 j=0; j<4; j++)
                        {
@@ -794,7 +794,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                        tile.texture.id) + "^[transformR90");
                                        
                        u16 l = getInteriorLight(n, 1, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        const f32 post_rad=(f32)BS/8;
                        const f32 bar_rad=(f32)BS/16;
@@ -997,7 +997,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        AtlasPointer ap = tile.texture;
                        
                        u16 l = getInteriorLight(n, 0, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        float d = (float)BS/64;
                        
@@ -1046,7 +1046,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        }
 
                        u16 l = getInteriorLight(n, 0, data);
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source));
 
                        v3f pos = intToFloat(p, BS);