summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-10-30 02:48:37 -0400
committerkwolekr <kwolekr@minetest.net>2015-11-02 18:43:09 -0500
commitc2b5da735ea0c961d4f6521df9d96142c7143eee (patch)
tree667ffa9cbbf5a606979a942634b030528822762c /src/server.h
parent5c3546e459ede7fbdfc22b340ed6b2af5073ec5b (diff)
downloadminetest-c2b5da735ea0c961d4f6521df9d96142c7143eee.tar.gz
minetest-c2b5da735ea0c961d4f6521df9d96142c7143eee.tar.bz2
minetest-c2b5da735ea0c961d4f6521df9d96142c7143eee.zip
Add callback parameter for core.emerge_area()
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server.h b/src/server.h
index a4be7d3fb..3ec889971 100644
--- a/src/server.h
+++ b/src/server.h
@@ -378,6 +378,9 @@ public:
// Bind address
Address m_bind_addr;
+ // Environment mutex (envlock)
+ Mutex m_env_mutex;
+
private:
friend class EmergeThread;
@@ -518,7 +521,6 @@ private:
// Environment
ServerEnvironment *m_env;
- Mutex m_env_mutex;
// server connection
con::Connection m_con;