diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-08-10 16:46:03 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-08-10 16:46:03 +0200 |
commit | cccc321384be18d4ac75e83abf3ce4d19a2a3d56 (patch) | |
tree | 8232f107e8868244254cce381187a17eb8d8bf4b | |
parent | Merge branch 'master' into LuaAPI (diff) | |
download | cuberite-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.cpp | 6 | ||||
-rw-r--r-- | src/World.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/World.cpp b/src/World.cpp index ab46e886c..dc1d9fedf 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -243,7 +243,7 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin #endif m_Dimension(a_Dimension), m_IsSpawnExplicitlySet(false), - m_CycleDaylight(true), + m_IsDaylightCycleEnabled(true), m_WorldAgeSecs(0), m_TimeOfDaySecs(0), m_WorldAge(0), @@ -832,7 +832,7 @@ void cWorld::Tick(float a_Dt, int a_LastTickDurationMSec) m_WorldAgeSecs += (double)a_Dt / 1000.0; m_WorldAge = (Int64)(m_WorldAgeSecs * 20.0); - if (m_CycleDaylight) + if (m_IsDaylightCycleEnabled) { // We need sub-tick precision here, that's why we store the time in seconds and calculate ticks off of it m_TimeOfDaySecs += (double)a_Dt / 1000.0; @@ -2249,7 +2249,7 @@ void cWorld::BroadcastThunderbolt(int a_BlockX, int a_BlockY, int a_BlockZ, cons void cWorld::BroadcastTimeUpdate(const cClientHandle * a_Exclude) { int TimeOfDay = m_TimeOfDay; - if (!m_CycleDaylight) + if (!m_IsDaylightCycleEnabled) { TimeOfDay *= -1; if (TimeOfDay == 0) 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 |