Permalink
Browse files

small fixes: crack texture, server build on windows, configuration fi…

…le example, adding config file example to install
  • Loading branch information...
1 parent e06751a commit 92432a28c00699e233cac46aa93d140994d25b14 @celeron55 committed Feb 16, 2011
Showing with 17 additions and 27 deletions.
  1. +4 −1 CMakeLists.txt
  2. BIN data/crack.png
  3. +0 −2 minetest.conf.example
  4. +4 −1 src/CMakeLists.txt
  5. +9 −23 src/map.cpp
View
@@ -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}")
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -33,8 +33,6 @@
#map-dir = /home/palle/custom_map
-#operator_name =
-
#plants_amount = 1.0
#ravines_amount = 1.0
#coal_amount = 1.0
View
@@ -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})
View
@@ -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);

0 comments on commit 92432a2

Please sign in to comment.