Cpp11 initializers: last src root changeset (#6022)

[oweals/minetest.git] / src / content_nodemeta.h

diff --git a/src/content_nodemeta.h b/src/content_nodemeta.h
index d206c35ad9eafbf1561497d2cca306d55c27d1e3..3c632ed4a0ca371191a6620d8c8cfcbcf408ef9e 100644 (file)
--- a/src/content_nodemeta.h
+++ b/src/content_nodemeta.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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
@@ -20,8 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CONTENT_NODEMETA_HEADER
 #define CONTENT_NODEMETA_HEADER
 
-#include "nodemetadata.h"
-#include "nodetimer.h"
+#include <iostream>
+
+class NodeMetadataList;
+class NodeTimerList;
+class IItemDefManager;
 
 /*
        Legacy nodemeta definitions
@@ -29,9 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 void content_nodemeta_deserialize_legacy(std::istream &is,
                NodeMetadataList *meta, NodeTimerList *timers,
-               IGameDef *gamedef);
-
-void content_nodemeta_serialize_legacy(std::ostream &os, NodeMetadataList *meta);
+               IItemDefManager *item_def_mgr);
 
 #endif