X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcontent_mapnode.cpp;h=44d0b8e386685f72ec3000a4fcce5120608b32f1;hb=55c646c5c2b40931d24be8541b3056ab3322a70f;hp=cacd7c88f78a5f276f8abcf624a7ad33b8f91be8;hpb=037b2591971d752e67fa7d47095b996b3f56da5a;p=oweals%2Fminetest.git diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index cacd7c88f..44d0b8e38 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -19,10 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_mapnode.h" -#include "irrlichttypes.h" +#include "irrlichttypes_bloated.h" #include "mapnode.h" #include "nodedef.h" -#include "utility.h" #include "nameidmapping.h" #include @@ -103,23 +102,6 @@ content_t trans_table_19[21][2] = { {CONTENT_BOOKSHELF, 29}, }; -MapNode mapnode_translate_from_internal(MapNode n_from, u8 version) -{ - MapNode result = n_from; - if(version <= 19) - { - content_t c_from = n_from.getContent(); - for(u32 i=0; i