mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
small fixes: crack texture, server build on windows, configuration file example, adding config file example to install
This commit is contained in:
parent
e06751aea0
commit
92432a28c0
@ -45,15 +45,18 @@ if(WIN32)
|
|||||||
set(DATADIR "data")
|
set(DATADIR "data")
|
||||||
set(BINDIR "bin")
|
set(BINDIR "bin")
|
||||||
set(DOCDIR "doc")
|
set(DOCDIR "doc")
|
||||||
|
set(EXAMPLE_CONF_DIR ".")
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
# random placeholders
|
# random placeholders
|
||||||
set(DATADIR "share/minetest")
|
set(DATADIR "share/minetest")
|
||||||
set(BINDIR "bin")
|
set(BINDIR "bin")
|
||||||
set(DOCDIR "share/doc/minetest")
|
set(DOCDIR "share/doc/minetest")
|
||||||
elseif(UNIX)
|
set(EXAMPLE_CONF_DIR ".")
|
||||||
|
elseif(UNIX) # Linux, BSD etc
|
||||||
set(DATADIR "usr/share/minetest")
|
set(DATADIR "usr/share/minetest")
|
||||||
set(BINDIR "usr/bin")
|
set(BINDIR "usr/bin")
|
||||||
set(DOCDIR "usr/share/doc/minetest")
|
set(DOCDIR "usr/share/doc/minetest")
|
||||||
|
set(EXAMPLE_CONF_DIR "usr/share/doc/minetest")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
|
install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
|
||||||
|
BIN
data/crack.png
BIN
data/crack.png
Binary file not shown.
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@ -33,8 +33,6 @@
|
|||||||
|
|
||||||
#map-dir = /home/palle/custom_map
|
#map-dir = /home/palle/custom_map
|
||||||
|
|
||||||
#operator_name =
|
|
||||||
|
|
||||||
#plants_amount = 1.0
|
#plants_amount = 1.0
|
||||||
#ravines_amount = 1.0
|
#ravines_amount = 1.0
|
||||||
#coal_amount = 1.0
|
#coal_amount = 1.0
|
||||||
|
@ -151,7 +151,7 @@ if(MSVC)
|
|||||||
|
|
||||||
if(BUILD_SERVER)
|
if(BUILD_SERVER)
|
||||||
set_target_properties(minetestserver PROPERTIES
|
set_target_properties(minetestserver PROPERTIES
|
||||||
COMPILE_DEFINITIONS "/D SERVER")
|
COMPILE_DEFINITIONS "SERVER")
|
||||||
endif(BUILD_SERVER)
|
endif(BUILD_SERVER)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
@ -184,6 +184,9 @@ endif()
|
|||||||
# Installation
|
# Installation
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Example configuration file
|
||||||
|
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
|
||||||
|
|
||||||
if(BUILD_CLIENT)
|
if(BUILD_CLIENT)
|
||||||
install(TARGETS minetest DESTINATION ${BINDIR})
|
install(TARGETS minetest DESTINATION ${BINDIR})
|
||||||
|
|
||||||
|
32
src/map.cpp
32
src/map.cpp
@ -4522,6 +4522,15 @@ MapBlock * ServerMap::emergeBlock(
|
|||||||
<<"You could try to delete it."<<std::endl;
|
<<"You could try to delete it."<<std::endl;
|
||||||
throw e;
|
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
|
NOTE: This should not be done, or at least the exception
|
||||||
should not be passed on as std::exception, because it
|
should not be passed on as std::exception, because it
|
||||||
@ -5088,29 +5097,6 @@ bool ServerMap::loadSectorFull(v2s16 p2d)
|
|||||||
return true;
|
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)
|
void ServerMap::saveBlock(MapBlock *block)
|
||||||
{
|
{
|
||||||
DSTACK(__FUNCTION_NAME);
|
DSTACK(__FUNCTION_NAME);
|
||||||
|
Loading…
Reference in New Issue
Block a user