From 5a34f40d80ea1a339b599bc11db549a6bd86912f Mon Sep 17 00:00:00 2001 From: kwolekr Date: Mon, 3 Feb 2014 22:42:10 -0500 Subject: 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. --- src/map.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/map.h') 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; -- cgit v1.2.3