Use std::queue for HTTPFetchRequest and std::vector for log_output instead of std...

[oweals/minetest.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index 9eb440c4241558d8225d372a4925e1350044e4f5..c9c3744139648d82f07bd85ae1a27d5cc7ce5635 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -81,22 +81,13 @@ public:
        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; }
-
-       float getTimeOfDayF()
-       { return m_time_of_day_f; }
+       virtual void setTimeOfDay(u32 time);
+       u32 getTimeOfDay();
+       float getTimeOfDayF();
 
        void stepTimeOfDay(float dtime);
 
        void setTimeOfDaySpeed(float speed);
-
        float getTimeOfDaySpeed();
 
        void setDayNightRatioOverride(bool enable, u32 value)
@@ -134,7 +125,8 @@ protected:
        bool m_cache_enable_shaders;
 
 private:
-       JMutex m_lock;
+       JMutex m_timeofday_lock;
+       JMutex m_time_lock;
 
 };
 
@@ -401,7 +393,7 @@ private:
        u32 m_game_time;
        // A helper variable for incrementing the latter
        float m_game_time_fraction_counter;
-       std::list<ABMWithState> m_abms;
+       std::vector<ABMWithState> m_abms;
        // An interval for generally sending object positions and stuff
        float m_recommended_send_interval;
        // Estimate for general maximum lag as determined by server.
@@ -529,7 +521,7 @@ private:
        IGameDef *m_gamedef;
        IrrlichtDevice *m_irr;
        std::map<u16, ClientActiveObject*> m_active_objects;
-       std::list<ClientSimpleObject*> m_simple_objects;
+       std::vector<ClientSimpleObject*> m_simple_objects;
        std::list<ClientEnvEvent> m_client_event_queue;
        IntervalLimiter m_active_object_light_update_interval;
        IntervalLimiter m_lava_hurt_interval;