Include irrlichttypes.h first to work around Irrlicht#433 (#10872)

[minetest.git] / src / mapgen / treegen.h

diff --git a/src/mapgen/treegen.h b/src/mapgen/treegen.h
index 8e5306560df52be8e114eaa759fcf1acec2ca7a5..59a418824128f1a958f29e6fd43cbdb772e90d9e 100644 (file)
--- a/src/mapgen/treegen.h
+++ b/src/mapgen/treegen.h
@@ -1,7 +1,9 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>,
-                         2012-2013 RealBadAngel, Maciej Kasatkin <mk@realbadangel.pl>
+Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>,
+Copyright (C) 2012-2018 RealBadAngel, Maciej Kasatkin
+Copyright (C) 2015-2018 paramat
+
 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
 the Free Software Foundation; either version 2.1 of the License, or
@@ -23,9 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "noise.h"
 
 class MMVManip;
-class INodeDefManager;
-class ServerEnvironment;
-
+class NodeDefManager;
+class ServerMap;
 
 namespace treegen {
 
@@ -59,24 +60,22 @@ namespace treegen {
 
        // Add default tree
        void make_tree(MMVManip &vmanip, v3s16 p0,
-               bool is_apple_tree, INodeDefManager *ndef, s32 seed);
+               bool is_apple_tree, const NodeDefManager *ndef, s32 seed);
        // Add jungle tree
        void make_jungletree(MMVManip &vmanip, v3s16 p0,
-               INodeDefManager *ndef, s32 seed);
+               const NodeDefManager *ndef, s32 seed);
        // Add pine tree
        void make_pine_tree(MMVManip &vmanip, v3s16 p0,
-               INodeDefManager *ndef, s32 seed);
+               const NodeDefManager *ndef, s32 seed);
 
        // Add L-Systems tree (used by engine)
-       treegen::error make_ltree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef,
-               TreeDef tree_definition);
+       treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
+               const NodeDefManager *ndef, TreeDef tree_definition);
        // Spawn L-systems tree from LUA
-       treegen::error spawn_ltree (ServerEnvironment *env, v3s16 p0, INodeDefManager *ndef,
-               const TreeDef &tree_definition);
+       treegen::error spawn_ltree (ServerMap *map, v3s16 p0,
+               const NodeDefManager *ndef, const TreeDef &tree_definition);
 
        // L-System tree gen helper functions
-       void tree_node_placement(MMVManip &vmanip, v3f p0,
-               MapNode node);
        void tree_trunk_placement(MMVManip &vmanip, v3f p0,
                TreeDef &tree_definition);
        void tree_leaves_placement(MMVManip &vmanip, v3f p0,