diff options
| author | Dániel Juhász <juhdanad@gmail.com> | 2018-02-10 22:04:16 +0200 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-02-10 21:04:16 +0100 |
| commit | 3face01a202040e4feff3b0936b4aa89c051c98d (patch) | |
| tree | ccdad6773aa9705cc07fdc9f71f28bae395f353e /src/mapgen/treegen.cpp | |
| parent | 617d94c8038e3ff035eaeef7ccdfa4f442feb873 (diff) | |
| download | dragonfireclient-3face01a202040e4feff3b0936b4aa89c051c98d.tar.xz | |
Node definition manager refactor (#7016)
* Rename IWritableNodeDefManager to NodeDefManager
* Make INodeDefManager functions const
* Use "const *NodeDefManager" instead of "*INodeDefManager"
* Remove unused INodeDefManager class
* Merge NodeDefManager and CNodeDefManager
* Document NodeDefManager
Diffstat (limited to 'src/mapgen/treegen.cpp')
| -rw-r--r-- | src/mapgen/treegen.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mapgen/treegen.cpp b/src/mapgen/treegen.cpp index 238bebec2..4c351fcef 100644 --- a/src/mapgen/treegen.cpp +++ b/src/mapgen/treegen.cpp @@ -33,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 @@ -115,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; @@ -142,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; @@ -648,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 @@ -747,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 |