aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-09-18 13:45:42 +0200
committerest31 <MTest31@outlook.com>2015-09-19 20:57:29 +0200
commit452df1c723722183ebf3a332f7bcc355be5b2998 (patch)
treecfba8eaa11c7bdc1d6c245bfa85c973597bccc3c /src/script
parent9c635f28ac2b103bf7196e47947bf64673c13393 (diff)
downloadminetest-452df1c723722183ebf3a332f7bcc355be5b2998.tar.gz
minetest-452df1c723722183ebf3a332f7bcc355be5b2998.tar.bz2
minetest-452df1c723722183ebf3a332f7bcc355be5b2998.zip
Various style cleanups + unused code removal
-> Don't pass pointer to whole IGameDef to NodeMetadata constructors and deserializers, but only to IItemDefManager, which is needed -> Remove the unused content_mapnode_get_new_name() method -> Fix style for MapBlock::deSerialize and MapBlock::deSerialize_pre22, improving accuracy of error messages a bit -> Fix style at other serialisation methods too -> Improve accuracy of some comments
Diffstat (limited to 'src/script')
-rw-r--r--src/script/lua_api/l_nodemeta.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/lua_api/l_nodemeta.cpp b/src/script/lua_api/l_nodemeta.cpp
index 6cdbe5c68..d8de9a412 100644
--- a/src/script/lua_api/l_nodemeta.cpp
+++ b/src/script/lua_api/l_nodemeta.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_content.h"
#include "environment.h"
#include "map.h"
+#include "gamedef.h"
#include "nodemetadata.h"
@@ -43,7 +44,7 @@ NodeMetadata* NodeMetaRef::getmeta(NodeMetaRef *ref, bool auto_create)
{
NodeMetadata *meta = ref->m_env->getMap().getNodeMetadata(ref->m_p);
if(meta == NULL && auto_create) {
- meta = new NodeMetadata(ref->m_env->getGameDef());
+ meta = new NodeMetadata(ref->m_env->getGameDef()->idef());
if(!ref->m_env->getMap().setNodeMetadata(ref->m_p, meta)) {
delete meta;
return NULL;