summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-04-16 23:37:50 -0400
committerkwolekr <kwolekr@minetest.net>2015-04-16 23:38:05 -0400
commit821d0025da3d7dec662e75c6ce2ea32e86aec508 (patch)
treec609455732a6bbcf12c4c00a6f1627bb5c15cf14 /src/server.h
parent4abb96fb546b5975c74ff2cc295255fe17126287 (diff)
downloadminetest-821d0025da3d7dec662e75c6ce2ea32e86aec508.tar.gz
minetest-821d0025da3d7dec662e75c6ce2ea32e86aec508.tar.bz2
minetest-821d0025da3d7dec662e75c6ce2ea32e86aec508.zip
Biomes: Remove referenced biomes from Decorations on clear
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server.h b/src/server.h
index da506acf1..ba993523b 100644
--- a/src/server.h
+++ b/src/server.h
@@ -297,9 +297,6 @@ public:
// Envlock and conlock should be locked when using scriptapi
GameScripting *getScriptIface(){ return m_script; }
- //TODO: determine what (if anything) should be locked to access EmergeManager
- EmergeManager *getEmergeManager(){ return m_emerge; }
-
// actions: time-reversed list
// Return value: success/failure
bool rollbackRevertActions(const std::list<RollbackAction> &actions,
@@ -317,7 +314,7 @@ public:
virtual MtEventManager* getEventManager();
virtual scene::ISceneManager* getSceneManager();
virtual IRollbackManager *getRollbackManager() { return m_rollback; }
-
+ virtual EmergeManager *getEmergeManager() { return m_emerge; }
IWritableItemDefManager* getWritableItemDefManager();
IWritableNodeDefManager* getWritableNodeDefManager();