From 92432a28c00699e233cac46aa93d140994d25b14 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Wed, 16 Feb 2011 20:03:31 +0200
Subject: small fixes: crack texture, server build on windows, configuration
 file example, adding config file example to install

---
 src/map.cpp | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'src/map.cpp')

diff --git a/src/map.cpp b/src/map.cpp
index 09cab79e2..ca2cdbc39 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -4522,6 +4522,15 @@ MapBlock * ServerMap::emergeBlock(
 				<<"You could try to delete it."<<std::endl;
 		throw e;
 	}
+	catch(VersionMismatchException &e)
+	{
+		dstream<<"emergeBlock: emergeSector() failed: "
+				<<e.what()<<std::endl;
+		dstream<<"Path to failed sector: "<<getSectorDir(p2d)
+				<<std::endl
+				<<"You could try to delete it."<<std::endl;
+		throw e;
+	}
 	/*
 		NOTE: This should not be done, or at least the exception
 		should not be passed on as std::exception, because it
@@ -5088,29 +5097,6 @@ bool ServerMap::loadSectorFull(v2s16 p2d)
 	return true;
 }
 
-#if 0
-bool ServerMap::deFlushSector(v2s16 p2d)
-{
-	DSTACK(__FUNCTION_NAME);
-	// See if it already exists in memory
-	try{
-		MapSector *sector = getSectorNoGenerate(p2d);
-		return true;
-	}
-	catch(InvalidPositionException &e)
-	{
-		/*
-			Try to load the sector from disk.
-		*/
-		if(loadSectorFull(p2d) == true)
-		{
-			return true;
-		}
-	}
-	return false;
-}
-#endif
-
 void ServerMap::saveBlock(MapBlock *block)
 {
 	DSTACK(__FUNCTION_NAME);
-- 
cgit v1.2.3