summaryrefslogtreecommitdiff
path: root/src/environment.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/environment.h')
-rw-r--r--src/environment.h24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/environment.h b/src/environment.h
index a3a659c5b..04df9be48 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -74,27 +74,39 @@ public:
core::list<Player*> getPlayers(bool ignore_disconnected);
void printPlayers(std::ostream &o);
- //void setDayNightRatio(u32 r);
u32 getDayNightRatio();
// 0-23999
virtual void setTimeOfDay(u32 time)
{
m_time_of_day = time;
+ m_time_of_day_f = (float)time / 24000.0;
}
u32 getTimeOfDay()
- {
- return m_time_of_day;
- }
+ { return m_time_of_day; }
+
+ float getTimeOfDayF()
+ { return m_time_of_day_f; }
+
+ void stepTimeOfDay(float dtime);
+
+ void setTimeOfDaySpeed(float speed)
+ { m_time_of_day_speed = speed; }
+
+ float getTimeOfDaySpeed()
+ { return m_time_of_day_speed; }
protected:
// peer_ids in here should be unique, except that there may be many 0s
core::list<Player*> m_players;
- // Brightness
- //u32 m_daynight_ratio;
// Time of day in milli-hours (0-23999); determines day and night
u32 m_time_of_day;
+ // Time of day in 0...1
+ float m_time_of_day_f;
+ float m_time_of_day_speed;
+ // Used to buffer dtime for adding to m_time_of_day
+ float m_time_counter;
};
/*