diff options
author | Weblate <42@minetest.ru> | 2013-02-02 21:34:12 +0400 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-02-02 21:34:12 +0400 |
commit | 1d248cce30105a66a411d327b5400f37a35db3b9 (patch) | |
tree | e489f681757416b8b9ab3c965689fb50a5a73d9c /src/map.h | |
parent | c33654c21ab13b072baadc65a72d31ae839ceec8 (diff) | |
parent | 6424c5b69809ad4799c08e93dd8cbdb13547da1c (diff) | |
download | minetest-1d248cce30105a66a411d327b5400f37a35db3b9.tar.gz minetest-1d248cce30105a66a411d327b5400f37a35db3b9.tar.bz2 minetest-1d248cce30105a66a411d327b5400f37a35db3b9.zip |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/map.h')
-rw-r--r-- | src/map.h | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -358,7 +358,7 @@ public: /* savedir: directory to which map data should be saved */ - ServerMap(std::string savedir, IGameDef *gamedef); + ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge); ~ServerMap(); s32 mapType() const @@ -480,16 +480,12 @@ public: MapgenParams *getMapgenParams(){ return m_mgparams; } - void setEmerge(EmergeManager *emerge){ m_emerge = emerge; } - // Parameters fed to the Mapgen MapgenParams *m_mgparams; private: // Seed used for all kinds of randomness in generation u64 m_seed; - - - + // Emerge manager EmergeManager *m_emerge; |