aboutsummaryrefslogtreecommitdiff
path: root/src/content_mapnode.h
diff options
context:
space:
mode:
authorsapier <sapier at gmx dot net>2012-02-04 12:41:25 +0100
committersapier <sapier at gmx dot net>2012-02-04 12:41:25 +0100
commit77df09540c4d7eadef760779e123af88a48aafaa (patch)
treefebf1009328d30c31a14a1a1ca1600e99b4c3e6b /src/content_mapnode.h
parent3454e6779337d8523ae76c7fa16eb8c565aa2381 (diff)
parenta1eb2836c0764829ebad1462432bb3c5f32750df (diff)
downloadminetest-77df09540c4d7eadef760779e123af88a48aafaa.tar.xz
Merge remote branch 'upstream/master' into sapier_experimental
Conflicts: src/scriptapi.cpp
Diffstat (limited to 'src/content_mapnode.h')
-rw-r--r--src/content_mapnode.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index b928e4407..003b7edd7 100644
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -26,12 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
Legacy node definitions
*/
-class IWritableNodeDefManager;
-
-// Initialize legacy node definitions
-// Not used used anywhere else than in test.cpp (and SHALL NOT BE)
-void content_mapnode_init(IWritableNodeDefManager *nodemgr);
-
// Backwards compatibility for non-extended content types in v19
extern content_t trans_table_19[21][2];
MapNode mapnode_translate_from_internal(MapNode n_from, u8 version);