Fix sky objects not rendering with ogles (#7598)

[dragonfireclient.git] / src / mapgen / treegen.cpp

diff --git a/src/mapgen/treegen.cpp b/src/mapgen/treegen.cpp
index 9e11b1a065e6916e8532860e69a73fb632c235b8..4c351fcefae0ef087ced97e67f3e04b64f72f2a1 100644 (file)
--- a/src/mapgen/treegen.cpp
+++ b/src/mapgen/treegen.cpp
@@ -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
@@ -31,8 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 namespace treegen
 {
 
-void make_tree(MMVManip &vmanip, v3s16 p0,
-               bool is_apple_tree, INodeDefManager *ndef, s32 seed)
+void make_tree(MMVManip &vmanip, v3s16 p0, bool is_apple_tree,
+       const NodeDefManager *ndef, s32 seed)
 {
        /*
                NOTE: Tree-placing code is currently duplicated in the engine
@@ -113,7 +115,7 @@ void make_tree(MMVManip &vmanip, v3s16 p0,
 
 // L-System tree LUA spawner
 treegen::error spawn_ltree(ServerEnvironment *env, v3s16 p0,
-               INodeDefManager *ndef, const TreeDef &tree_definition)
+       const NodeDefManager *ndef, const TreeDef &tree_definition)
 {
        ServerMap *map = &env->getServerMap();
        std::map<v3s16, MapBlock*> modified_blocks;
@@ -140,7 +142,7 @@ treegen::error spawn_ltree(ServerEnvironment *env, v3s16 p0,
 
 //L-System tree generator
 treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
-               INodeDefManager *ndef, TreeDef tree_definition)
+       const NodeDefManager *ndef, TreeDef tree_definition)
 {
        MapNode dirtnode(ndef->getId("mapgen_dirt"));
        s32 seed;
@@ -646,7 +648,8 @@ v3f transposeMatrix(irr::core::matrix4 M, v3f v)
 }
 
 
-void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
+void make_jungletree(MMVManip &vmanip, v3s16 p0, const NodeDefManager *ndef,
+       s32 seed)
 {
        /*
                NOTE: Tree-placing code is currently duplicated in the engine
@@ -745,7 +748,8 @@ void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed
 }
 
 
-void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
+void make_pine_tree(MMVManip &vmanip, v3s16 p0, const NodeDefManager *ndef,
+       s32 seed)
 {
        /*
                NOTE: Tree-placing code is currently duplicated in the engine