summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-10-27 21:03:59 +0100
committerest31 <MTest31@outlook.com>2015-10-27 23:19:17 +0100
commitca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8 (patch)
treecc5d8627278d725f630e9df99b14a6b5964b4543 /src/server.h
parentc406438b95e3df181961add56a2511b96bd9d690 (diff)
downloadminetest-ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8.tar.gz
minetest-ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8.tar.bz2
minetest-ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8.zip
Environment: Time of day fixes and add serverside getter
-> Put access to time variables under the time lock. -> Merge both time locks, there is no point to have two locks. -> Fix the lock being released too early in Environment::setTimeOfDay -> Add serverside getter so that you don't have to get the environment if you only have the server
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 26ec3ab73..fa732010a 100644
--- a/src/server.h
+++ b/src/server.h
@@ -220,8 +220,10 @@ public:
void Send(NetworkPacket* pkt);
- // Environment must be locked when called
+ // Both setter and getter need no envlock,
+ // can be called freely from threads
void setTimeOfDay(u32 time);
+ inline u32 getTimeOfDay();
/*
Shall be called with the environment locked.