diff options
| author | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
| commit | 1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124 (patch) | |
| tree | 54660f353f3342f89b6259ea6a5dfedfa20dc16f /src/map.cpp | |
| parent | ec039a3d123120f9918812b13f5971e94546b9af (diff) | |
| parent | 64627817fcca52f20948c24b60ce192b218f6ce2 (diff) | |
| download | dragonfireclient-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map.cpp b/src/map.cpp index 821805d4e..43502253b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -288,10 +288,10 @@ void Map::unspreadLight(enum LightBank bank, continue; // Calculate relative position in block - v3s16 relpos = pos - blockpos_last * MAP_BLOCKSIZE; + //v3s16 relpos = pos - blockpos_last * MAP_BLOCKSIZE; // Get node straight from the block - MapNode n = block->getNode(relpos); + //MapNode n = block->getNode(relpos); u8 oldlight = j->second; @@ -937,7 +937,7 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n, */ v3s16 toppos = p + v3s16(0,1,0); - v3s16 bottompos = p + v3s16(0,-1,0); + //v3s16 bottompos = p + v3s16(0,-1,0); bool node_under_sunlight = true; std::set<v3s16> light_sources; @@ -1246,7 +1246,7 @@ void Map::removeNodeAndUpdate(v3s16 p, // Get the brightest neighbour node and propagate light from it v3s16 n2p = getBrightestNeighbour(bank, p); try{ - MapNode n2 = getNode(n2p); + //MapNode n2 = getNode(n2p); lightNeighbors(bank, n2p, modified_blocks); } catch(InvalidPositionException &e) @@ -1755,7 +1755,7 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks) } //relax up - if (relax && p0.Y <= water_level && liquid_levels[D_TOP] == 0 && + if (relax && ((p0.Y == water_level) || (fast_flood && p0.Y <= water_level)) && liquid_levels[D_TOP] == 0 && liquid_levels[D_BOTTOM] == LIQUID_LEVEL_SOURCE && total_level >= LIQUID_LEVEL_SOURCE * can_liquid_same_level- (can_liquid_same_level - relax) && @@ -2831,7 +2831,7 @@ ServerMapSector * ServerMap::createSector(v2s16 p2d) sector = new ServerMapSector(this, p2d, m_gamedef); // Sector position on map in nodes - v2s16 nodepos2d = p2d * MAP_BLOCKSIZE; + //v2s16 nodepos2d = p2d * MAP_BLOCKSIZE; /* Insert to container |