summaryrefslogtreecommitdiff
path: root/src/emerge.h
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-03-23 15:43:26 +0100
committerGitHub <noreply@github.com>2021-03-23 15:43:26 +0100
commit2da1eee394554879bf1cee6bc0f7b77acf0b6c43 (patch)
treec27bf698c21f13263fa3d56cd51ebaeace30ce2e /src/emerge.h
parentc9eba8440d3dc293a8aa6ffafc045737732da1e1 (diff)
downloadminetest-2da1eee394554879bf1cee6bc0f7b77acf0b6c43.tar.gz
minetest-2da1eee394554879bf1cee6bc0f7b77acf0b6c43.tar.bz2
minetest-2da1eee394554879bf1cee6bc0f7b77acf0b6c43.zip
Fix broken `BiomeGen` abstraction (#11107)
Diffstat (limited to 'src/emerge.h')
-rw-r--r--src/emerge.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/emerge.h b/src/emerge.h
index da845e243..aac3e7dd3 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -99,13 +99,15 @@ public:
u32 gen_notify_on;
const std::set<u32> *gen_notify_on_deco_ids; // shared
+ BiomeGen *biomegen;
BiomeManager *biomemgr;
OreManager *oremgr;
DecorationManager *decomgr;
SchematicManager *schemmgr;
private:
- EmergeParams(EmergeManager *parent, const BiomeManager *biomemgr,
+ EmergeParams(EmergeManager *parent, const BiomeGen *biomegen,
+ const BiomeManager *biomemgr,
const OreManager *oremgr, const DecorationManager *decomgr,
const SchematicManager *schemmgr);
};
@@ -140,6 +142,8 @@ public:
~EmergeManager();
DISABLE_CLASS_COPY(EmergeManager);
+ const BiomeGen *getBiomeGen() const { return biomegen; }
+
// no usage restrictions
const BiomeManager *getBiomeManager() const { return biomemgr; }
const OreManager *getOreManager() const { return oremgr; }
@@ -196,6 +200,7 @@ private:
// Managers of various map generation-related components
// Note that each Mapgen gets a copy(!) of these to work with
+ BiomeGen *biomegen;
BiomeManager *biomemgr;
OreManager *oremgr;
DecorationManager *decomgr;