diff options
| author | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
| commit | feb7de91ec34ef1ca3152270a7bc62b2e308f1bd (patch) | |
| tree | 65c33378bae9b7ac565b979237b6d594b511171f /src/server.h | |
| parent | 33052abf42886ef03c4f46196cab6f767259a672 (diff) | |
| parent | 4468ea84e6d0faede5a01e8d97d359c537aa7ec8 (diff) | |
| download | minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.gz minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.bz2 minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/server.h b/src/server.h index 04e693fc8..ea1cb79af 100644 --- a/src/server.h +++ b/src/server.h @@ -485,7 +485,6 @@ public: void deleteParticleSpawner(const char *playername, u32 id); void deleteParticleSpawnerAll(u32 id); - void queueBlockEmerge(v3s16 blockpos, bool allow_generate); // Creates or resets inventory @@ -497,11 +496,9 @@ public: // Envlock should be locked when using the rollback manager IRollbackManager *getRollbackManager(){ return m_rollback; } - //TODO: determine what should be locked when accessing the emerge manager + //TODO: determine what (if anything) should be locked to access EmergeManager EmergeManager *getEmergeManager(){ return m_emerge; } - BiomeDefManager *getBiomeDef(){ return m_biomedef; } - // actions: time-reversed list // Return value: success/failure bool rollbackRevertActions(const std::list<RollbackAction> &actions, @@ -734,9 +731,6 @@ private: // Emerge manager EmergeManager *m_emerge; - // Biome Definition Manager - BiomeDefManager *m_biomedef; - // Scripting // Envlock and conlock should be locked when using Lua lua_State *m_lua; |