diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-04-11 19:59:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 19:59:43 +0200 |
| commit | 5cc06e4748a82acb36310fee89e72f30b2b35a36 (patch) | |
| tree | bf99c5498f491c831c8494c064f2be5502f4bdf0 /src/mapgen | |
| parent | 5146086a64d5eeb480948d612a008a2ec81455d4 (diff) | |
| download | minetest-5cc06e4748a82acb36310fee89e72f30b2b35a36.tar.gz minetest-5cc06e4748a82acb36310fee89e72f30b2b35a36.tar.bz2 minetest-5cc06e4748a82acb36310fee89e72f30b2b35a36.zip | |
Reduce ServerEnvironment propagation (#9642)
ServerEnvironment is a huge class with many accessors. In various places it's not needed
Remove it to reduce the ServerEnvironment view.
Idea here is to reduce size of some of our objects to transport lightweight managers and permit easier testing
Pathfinder is now tied to a generic map, not a ServerMap, it can be
ported to client
Diffstat (limited to 'src/mapgen')
| -rw-r--r-- | src/mapgen/treegen.cpp | 4 | ||||
| -rw-r--r-- | src/mapgen/treegen.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/mapgen/treegen.cpp b/src/mapgen/treegen.cpp index 89bdef73b..d538e15b4 100644 --- a/src/mapgen/treegen.cpp +++ b/src/mapgen/treegen.cpp @@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/numeric.h" #include "map.h" #include "mapblock.h" -#include "serverenvironment.h" #include "nodedef.h" #include "treegen.h" #include "voxelalgorithms.h" @@ -120,10 +119,9 @@ void make_tree(MMVManip &vmanip, v3s16 p0, bool is_apple_tree, // L-System tree LUA spawner -treegen::error spawn_ltree(ServerEnvironment *env, v3s16 p0, +treegen::error spawn_ltree(ServerMap *map, v3s16 p0, const NodeDefManager *ndef, const TreeDef &tree_definition) { - ServerMap *map = &env->getServerMap(); std::map<v3s16, MapBlock*> modified_blocks; MMVManip vmanip(map); v3s16 tree_blockp = getNodeBlockPos(p0); diff --git a/src/mapgen/treegen.h b/src/mapgen/treegen.h index 5ab79f428..447baabb3 100644 --- a/src/mapgen/treegen.h +++ b/src/mapgen/treegen.h @@ -26,8 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class MMVManip; class NodeDefManager; -class ServerEnvironment; - +class ServerMap; namespace treegen { @@ -73,7 +72,7 @@ namespace treegen { 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, + treegen::error spawn_ltree (ServerMap *map, v3s16 p0, const NodeDefManager *ndef, const TreeDef &tree_definition); // L-System tree gen helper functions |