summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-08-10 16:46:03 +0200
committerHowaner <franzi.moos@googlemail.com>2014-08-10 16:46:03 +0200
commitcccc321384be18d4ac75e83abf3ce4d19a2a3d56 (patch)
tree8232f107e8868244254cce381187a17eb8d8bf4b /src/World.h
parentMerge branch 'master' into LuaAPI (diff)
downloadcuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.tar
cuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.tar.gz
cuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.tar.bz2
cuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.tar.lz
cuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.tar.xz
cuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.tar.zst
cuberite-cccc321384be18d4ac75e83abf3ce4d19a2a3d56.zip
Diffstat (limited to '')
-rw-r--r--src/World.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/World.h b/src/World.h
index 4e85087fc..6df1758e9 100644
--- a/src/World.h
+++ b/src/World.h
@@ -147,12 +147,12 @@ public:
int GetTicksUntilWeatherChange(void) const { return m_WeatherInterval; }
/** Is the daylight cyclus enabled? */
- virtual bool IsDaylightCycleEnabled(void) const { return m_CycleDaylight; }
+ virtual bool IsDaylightCycleEnabled(void) const { return m_IsDaylightCycleEnabled; }
/** Sets the daylight cyclus to true/false. */
- virtual void SetDoDaylightCycle(bool a_CycleDaylight)
+ virtual void SetDaylightCycleEnabled(bool a_IsDaylightCycleEnabled)
{
- m_CycleDaylight = a_CycleDaylight;
+ m_IsDaylightCycleEnabled = a_IsDaylightCycleEnabled;
BroadcastTimeUpdate();
}
@@ -879,7 +879,7 @@ private:
bool m_BroadcastDeathMessages;
bool m_BroadcastAchievementMessages;
- bool m_CycleDaylight; // Is the daylight cyclus enabled?
+ bool m_IsDaylightCycleEnabled;
double m_WorldAgeSecs; // World age, in seconds. Is only incremented, cannot be set by plugins.
double m_TimeOfDaySecs; // Time of day in seconds. Can be adjusted. Is wrapped to zero each day.
Int64 m_WorldAge; // World age in ticks, calculated off of m_WorldAgeSecs