summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-08-08 18:38:20 +0200
committerHowaner <franzi.moos@googlemail.com>2014-08-08 22:07:30 +0200
commit32e1e9a5536f92d074d51cca207f21c372973629 (patch)
tree439625f64d9b7c69b61f27a7c2bfa81f1470f79a /src
parentAdded SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. (diff)
downloadcuberite-32e1e9a5536f92d074d51cca207f21c372973629.tar
cuberite-32e1e9a5536f92d074d51cca207f21c372973629.tar.gz
cuberite-32e1e9a5536f92d074d51cca207f21c372973629.tar.bz2
cuberite-32e1e9a5536f92d074d51cca207f21c372973629.tar.lz
cuberite-32e1e9a5536f92d074d51cca207f21c372973629.tar.xz
cuberite-32e1e9a5536f92d074d51cca207f21c372973629.tar.zst
cuberite-32e1e9a5536f92d074d51cca207f21c372973629.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp6
-rw-r--r--src/World.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 7ed8bc1e4..ab46e886c 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_DoDaylightCycle(true),
+ m_CycleDaylight(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_DoDaylightCycle)
+ if (m_CycleDaylight)
{
// 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_DoDaylightCycle)
+ if (!m_CycleDaylight)
{
TimeOfDay *= -1;
if (TimeOfDay == 0)
diff --git a/src/World.h b/src/World.h
index 8ddc69118..4e85087fc 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_DoDaylightCycle; }
+ virtual bool IsDaylightCycleEnabled(void) const { return m_CycleDaylight; }
/** Sets the daylight cyclus to true/false. */
- virtual void SetDoDaylightCycle(bool a_DoDaylightCycle)
+ virtual void SetDoDaylightCycle(bool a_CycleDaylight)
{
- m_DoDaylightCycle = a_DoDaylightCycle;
+ m_CycleDaylight = a_CycleDaylight;
BroadcastTimeUpdate();
}
@@ -879,7 +879,7 @@ private:
bool m_BroadcastDeathMessages;
bool m_BroadcastAchievementMessages;
- bool m_DoDaylightCycle; // Is the daylight cyclus enabled?
+ bool m_CycleDaylight; // Is the daylight cyclus enabled?
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