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 13c0c0efe329a8d234ca5abb33300a5ab3d0e804..c9c3744139648d82f07bd85ae1a27d5cc7ce5635 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -75,28 +75,19 @@ public:
        Player * getPlayer(const char *name);
        Player * getRandomConnectedPlayer();
        Player * getNearestConnectedPlayer(v3f pos);
-       std::list<Player*> getPlayers();
-       std::list<Player*> getPlayers(bool ignore_disconnected);
+       std::vector<Player*> getPlayers();
+       std::vector<Player*> getPlayers(bool ignore_disconnected);
 
        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)
@@ -110,7 +101,7 @@ public:
 
 protected:
        // peer_ids in here should be unique, except that there may be many 0s
-       std::list<Player*> m_players;
+       std::vector<Player*> m_players;
        // Time of day in milli-hours (0-23999); determines day and night
        u32 m_time_of_day;
        // Time of day in 0...1
@@ -134,7 +125,8 @@ protected:
        bool m_cache_enable_shaders;
 
 private:
-       JMutex m_lock;
+       JMutex m_timeofday_lock;
+       JMutex m_time_lock;
 
 };
 
@@ -182,7 +174,7 @@ struct ABMWithState
 class ActiveBlockList
 {
 public:
-       void update(std::list<v3s16> &active_positions,
+       void update(std::vector<v3s16> &active_positions,
                        s16 radius,
                        std::set<v3s16> &blocks_removed,
                        std::set<v3s16> &blocks_added);
@@ -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;