summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2014-02-03 22:42:10 -0500
committerkwolekr <kwolekr@minetest.net>2014-02-03 22:50:14 -0500
commit5a34f40d80ea1a339b599bc11db549a6bd86912f (patch)
tree07ead9e3ff4732479af41b739a26b5dc8182c5fd /src/map.h
parenta439343844cf821e4922e23f1638b92e2cfb14ac (diff)
downloadminetest-5a34f40d80ea1a339b599bc11db549a6bd86912f.tar.gz
minetest-5a34f40d80ea1a339b599bc11db549a6bd86912f.tar.bz2
minetest-5a34f40d80ea1a339b599bc11db549a6bd86912f.zip
Huge overhaul of the entire MapgenParams system
MapgenParams is no longer a polymorphic class, eliminating the need for messy and bug-prone reallocations. Separation between the common and mapgen-specific parameters is now strongly defined. Mapgen parameters objects are now properly encapsulated within the proper subsystems.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/map.h b/src/map.h
index 5ec1a0b9d..54d8fe9ea 100644
--- a/src/map.h
+++ b/src/map.h
@@ -493,21 +493,13 @@ public:
bool isSavingEnabled(){ return m_map_saving_enabled; }
- u64 getSeed(){ return m_seed; }
-
- MapgenParams *getMapgenParams(){ return m_mgparams; }
- void setMapgenParams(MapgenParams *mgparams){ m_mgparams = mgparams; }
-
- // Parameters fed to the Mapgen
- MapgenParams *m_mgparams;
+ u64 getSeed();
+ s16 getWaterLevel();
virtual s16 updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
virtual s16 updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
private:
- // Seed used for all kinds of randomness in generation
- u64 m_seed;
-
// Emerge manager
EmergeManager *m_emerge;