diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | data/crack.png | bin | 1085 -> 1076 bytes | |||
| -rw-r--r-- | minetest.conf.example | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | 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 Binary files differindex 0fef2a6fd..499783982 100644 --- a/data/crack.png +++ b/data/crack.png 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); |
