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: [PATCH] small fixes: crack texture, server build on windows,
 configuration file example, adding config file example to install

---
 CMakeLists.txt        |   5 ++++-
 data/crack.png        | Bin 1085 -> 1076 bytes
 minetest.conf.example |   2 --
 src/CMakeLists.txt    |   5 ++++-
 src/map.cpp           |  32 +++++++++-----------------------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0f248d13..da820dcc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,15 +45,18 @@ if(WIN32)
 	set(DATADIR "data")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
+	set(EXAMPLE_CONF_DIR ".")
 elseif(APPLE)
 	# random placeholders
 	set(DATADIR "share/minetest")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/minetest")
-elseif(UNIX)
+	set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
 	set(DATADIR "usr/share/minetest")
 	set(BINDIR "usr/bin")
 	set(DOCDIR "usr/share/doc/minetest")
+	set(EXAMPLE_CONF_DIR "usr/share/doc/minetest")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
diff --git a/data/crack.png b/data/crack.png
index 0fef2a6fddd13c5d5c851ce38943703ff51e89bd..499783982d553bfecbc596175b492dd0f2346a32 100644
GIT binary patch
delta 270
zcmV+p0rCF52($>WFav+@Nkl<ZSi|jC%MQaJ41;Oky@QeZ+uo&`5aOAnluqOZA|WKU
z0q3@@Z%oFA#E~P8=`OTBg2;|#f^2)Fp=Z%+CY8Ihss-U0<QM2&arDl)5CsY6T(fY@
z?0B6Xw7L*9q5?~0!sgWtG^Rxda5;=6f&xh`Qb-pWn!`RKC-#42!vQ@&X~LX^v~Z-P
zjouOm-U68qzLBeQX%Rn~-n+s@Dt^7HulHOA94%f+4>&~+av7i&fQ3vT1<<;BAU=}1
z9&=tRP}01ceQ1%W)k6NE9`Fu5poJd5L=S45zg`bUerrR=Vh6;<e5dy78{)wiKk<fy
UN=gD=00000Nks-uM6N<$f-jYMjsO4v

delta 279
zcmV+y0qFj;2)zifFav-1Nkl<ZSi|jC%MJq}2y~nNwmo37Ki$LhvT2OL7ofGR+%$r`
zW>Dw0tS?B`r$iAwis>z|4nZX6GDfz1rBKVE+e|1odsQ-m%gEc%y`XqF=R#y8Tzl2T
zfw^%UAJnQ4G^9e7%tRYklf@@xBTebXwy}gzsP{0Kmd+y7Gwy#=q=Xi4(7^{j7oRx_
zVW9{~84pb#JQ-ueCGJlqa&a$B;zLt=ml>qu*Q<KGa~_~Kc{x5n>nv390p|gg3?SnP
zNgHTgJ`jhb&c~eB3MpaUj6SM?s8&M!ARpipd;kkRAQL_)VSYRx^!(Pk!a_rfi}4Qa
d*EhtA7ZiktYo`xA+JyiB002ovPDHLkV1f^=e6auk

diff --git a/minetest.conf.example b/minetest.conf.example
index 24865da7d..edf43e889 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -33,8 +33,6 @@
 
 #map-dir = /home/palle/custom_map
 
-#operator_name = 
-
 #plants_amount = 1.0
 #ravines_amount = 1.0
 #coal_amount = 1.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1c684b0fe..c0301cc80 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,7 +151,7 @@ if(MSVC)
 	
 	if(BUILD_SERVER)
 		set_target_properties(minetestserver PROPERTIES
-				COMPILE_DEFINITIONS "/D SERVER")
+				COMPILE_DEFINITIONS "SERVER")
 	endif(BUILD_SERVER)
 
 else()
@@ -184,6 +184,9 @@ endif()
 # Installation
 #
 
+# Example configuration file
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
+
 if(BUILD_CLIENT)
 	install(TARGETS minetest DESTINATION ${BINDIR})
 
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);