From 6350c5d7a606924a12ba41468d126ff94d9e6d36 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 20 Dec 2010 14:59:21 +0200
Subject: some tinkering with gui. removed updating of configuration file at
 end

---
 src/map.cpp | 62 +++----------------------------------------------------------
 1 file changed, 3 insertions(+), 59 deletions(-)

(limited to 'src/map.cpp')

diff --git a/src/map.cpp b/src/map.cpp
index db9d4120e..acaebe257 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1141,21 +1141,21 @@ bool Map::dayNightDiffed(v3s16 blockpos)
 	}
 	catch(InvalidPositionException &e){}
 	try{
-		v3s16 p = blockpos + v3s16(1,0,0);
+		v3s16 p = blockpos + v3s16(-1,0,0);
 		MapBlock *b = getBlockNoCreate(p);
 		if(b->dayNightDiffed())
 			return true;
 	}
 	catch(InvalidPositionException &e){}
 	try{
-		v3s16 p = blockpos + v3s16(0,1,0);
+		v3s16 p = blockpos + v3s16(0,-1,0);
 		MapBlock *b = getBlockNoCreate(p);
 		if(b->dayNightDiffed())
 			return true;
 	}
 	catch(InvalidPositionException &e){}
 	try{
-		v3s16 p = blockpos + v3s16(0,0,1);
+		v3s16 p = blockpos + v3s16(0,0,-1);
 		MapBlock *b = getBlockNoCreate(p);
 		if(b->dayNightDiffed())
 			return true;
@@ -1805,26 +1805,6 @@ MapBlock * ServerMap::emergeBlock(
 				Calculate material
 			*/
 
-			// If node is very low
-			/*if(real_y <= surface_y - 7)
-			{
-				// Create dungeons
-				if(underground_emptiness[
-						ued*ued*(z0*ued/MAP_BLOCKSIZE)
-						+ued*(y0*ued/MAP_BLOCKSIZE)
-						+(x0*ued/MAP_BLOCKSIZE)])
-				{
-					n.d = CONTENT_AIR;
-				}
-				else
-				{
-					n.d = CONTENT_STONE;
-				}
-			}
-			// If node is under surface level
-			else if(real_y <= surface_y - surface_depth)
-				n.d = CONTENT_STONE;
-			*/
 			if(real_y <= surface_y - surface_depth)
 			{
 				// Create dungeons
@@ -1955,42 +1935,6 @@ MapBlock * ServerMap::emergeBlock(
 	*/
 	sector->insertBlock(block);
 	
-	/*
-		Do some interpolation for dungeons
-	*/
-
-#if 0	
-	{
-	TimeTaker timer("interpolation", g_device);
-	
-	MapVoxelManipulator vmanip(this);
-	
-	v3s16 relpos = block->getPosRelative();
-
-	vmanip.interpolate(VoxelArea(relpos-v3s16(1,1,1),
-			relpos+v3s16(1,1,1)*(MAP_BLOCKSIZE+1)));
-	/*vmanip.interpolate(VoxelArea(relpos,
-			relpos+v3s16(1,1,1)*(MAP_BLOCKSIZE-1)));*/
-	
-	core::map<v3s16, MapBlock*> modified_blocks;
-	vmanip.blitBack(modified_blocks);
-	dstream<<"blitBack modified "<<modified_blocks.size()
-			<<" blocks"<<std::endl;
-
-	// Add modified blocks to changed_blocks and lighting_invalidated_blocks
-	for(core::map<v3s16, MapBlock*>::Iterator
-			i = modified_blocks.getIterator();
-			i.atEnd() == false; i++)
-	{
-		MapBlock *block = i.getNode()->getValue();
-
-		changed_blocks.insert(block->getPos(), block);
-		//lighting_invalidated_blocks.insert(block->getPos(), block);
-	}
-
-	}
-#endif
-
 	/*
 		Sector object stuff
 	*/
-- 
cgit v1.2.3