summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-06-02 11:01:28 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-06-03 22:31:01 +0300
commit3899f83da879e11cf531c88514772b890d060721 (patch)
tree2fa3533bf454568f6cdd2560b24ade78776a3837 /src/map.cpp
parent5f3c70061deea330a23be33164a34f675721d452 (diff)
downloadminetest-3899f83da879e11cf531c88514772b890d060721.tar.gz
minetest-3899f83da879e11cf531c88514772b890d060721.tar.bz2
minetest-3899f83da879e11cf531c88514772b890d060721.zip
NodeMetaRef:{to,from}_table and lua_api.txt additions
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/map.cpp b/src/map.cpp
index c981567ae..10dba3de9 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1010,6 +1010,12 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
}
/*
+ Remove node metadata
+ */
+
+ removeNodeMetadata(p);
+
+ /*
Set the node on the map
*/
@@ -3451,15 +3457,15 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
}
catch(InvalidFilenameException &e)
{
- return false;
+ return NULL;
}
catch(FileNotGoodException &e)
{
- return false;
+ return NULL;
}
catch(std::exception &e)
{
- return false;
+ return NULL;
}
}