diff options
author | kwolekr <mirrorisim@gmail.com> | 2013-01-29 13:05:56 -0800 |
---|---|---|
committer | kwolekr <mirrorisim@gmail.com> | 2013-01-29 13:05:56 -0800 |
commit | cbbb6447bfd3a6d0013b3605aeca840733d87561 (patch) | |
tree | 5b0db6a11820a1fba82e6154cfcd17b783efc771 /src/map.h | |
parent | 6912f65cd73997ff1fedaf87aafc27fdd2c21fa4 (diff) | |
parent | 91e88196c7c0e7ee87c1fd4783b3999710510a65 (diff) | |
download | hax-minetest-server-cbbb6447bfd3a6d0013b3605aeca840733d87561.tar.gz hax-minetest-server-cbbb6447bfd3a6d0013b3605aeca840733d87561.zip |
Merge pull request #441 from kwolekr/mapgen_factories
Make mapgen factory setup more elegant, add mapgen_v6.h
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; |