MSVC: Generate debug information for release builds (#4674)

[minetest.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index 1ba7b196fa914ddbf3f4a5fd098a825e7dfd745a..4bee40e57f223936bf81aebe8d4cd1be8064641f 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -54,6 +54,7 @@ class ClientMap;
 class GameScripting;
 class Player;
 class RemotePlayer;
+class PlayerSAO;
 
 class Environment
 {
@@ -72,15 +73,6 @@ class Environment
 
        virtual Map & getMap() = 0;
 
-       virtual void addPlayer(Player *player);
-       void removePlayer(Player *player);
-       Player * getPlayer(u16 peer_id);
-       Player * getPlayer(const char *name);
-       Player * getRandomConnectedPlayer();
-       Player * getNearestConnectedPlayer(v3f pos);
-       std::vector<Player*> getPlayers();
-       std::vector<Player*> getPlayers(bool ignore_disconnected);
-
        u32 getDayNightRatio();
 
        // 0-23999
@@ -91,7 +83,6 @@ class Environment
        void stepTimeOfDay(float dtime);
 
        void setTimeOfDaySpeed(float speed);
-       float getTimeOfDaySpeed();
 
        void setDayNightRatioOverride(bool enable, u32 value);
 
@@ -101,9 +92,6 @@ class Environment
        u32 m_added_objects;
 
 protected:
-       // peer_ids in here should be unique, except that there may be many 0s
-       std::vector<Player*> m_players;
-
        GenericAtomic<float> m_time_of_day_speed;
 
        /*
@@ -328,7 +316,9 @@ class ServerEnvironment : public Environment
        // Save players
        void saveLoadedPlayers();
        void savePlayer(RemotePlayer *player);
-       Player *loadPlayer(const std::string &playername);
+       RemotePlayer *loadPlayer(const std::string &playername, PlayerSAO *sao);
+       void addPlayer(RemotePlayer *player);
+       void removePlayer(RemotePlayer *player);
 
        /*
                Save and load time of day and game timer
@@ -340,7 +330,8 @@ class ServerEnvironment : public Environment
        void loadDefaultMeta();
 
        u32 addParticleSpawner(float exptime);
-       void deleteParticleSpawner(u32 id) { m_particle_spawners.erase(id); }
+       u32 addParticleSpawner(float exptime, u16 attached_id);
+       void deleteParticleSpawner(u32 id, bool remove_from_object = true);
 
        /*
                External ActiveObject interface
@@ -372,7 +363,7 @@ class ServerEnvironment : public Environment
                Find out what new objects have been added to
                inside a radius around a position
        */
-       void getAddedActiveObjects(Player *player, s16 radius,
+       void getAddedActiveObjects(PlayerSAO *playersao, s16 radius,
                        s16 player_radius,
                        std::set<u16> &current_objects,
                        std::queue<u16> &added_objects);
@@ -381,7 +372,7 @@ class ServerEnvironment : public Environment
                Find out what new objects have been removed from
                inside a radius around a position
        */
-       void getRemovedActiveObjects(Player* player, s16 radius,
+       void getRemovedActiveObjects(PlayerSAO *playersao, s16 radius,
                        s16 player_radius,
                        std::set<u16> &current_objects,
                        std::queue<u16> &removed_objects);
@@ -440,6 +431,8 @@ class ServerEnvironment : public Environment
        void setStaticForActiveObjectsInBlock(v3s16 blockpos,
                bool static_exists, v3s16 static_block=v3s16(0,0,0));
 
+       RemotePlayer *getPlayer(const u16 peer_id);
+       RemotePlayer *getPlayer(const char* name);
 private:
 
        /*
@@ -522,9 +515,13 @@ class ServerEnvironment : public Environment
        // Can raise to high values like 15s with eg. map generation mods.
        float m_max_lag_estimate;
 
+       // peer_ids in here should be unique, except that there may be many 0s
+       std::vector<RemotePlayer*> m_players;
+
        // Particles
        IntervalLimiter m_particle_management_interval;
        UNORDERED_MAP<u32, float> m_particle_spawners;
+       UNORDERED_MAP<u32, u16> m_particle_spawner_attachments;
 };
 
 #ifndef SERVER
@@ -581,8 +578,8 @@ class ClientEnvironment : public Environment
 
        void step(f32 dtime);
 
-       virtual void addPlayer(Player *player);
-       LocalPlayer * getLocalPlayer();
+       virtual void setLocalPlayer(LocalPlayer *player);
+       LocalPlayer *getLocalPlayer() { return m_local_player; }
 
        /*
                ClientSimpleObjects
@@ -632,24 +629,20 @@ class ClientEnvironment : public Environment
 
        u16 attachement_parent_ids[USHRT_MAX + 1];
 
-       std::list<std::string> getPlayerNames()
-       { return m_player_names; }
-       void addPlayerName(std::string name)
-       { m_player_names.push_back(name); }
-       void removePlayerName(std::string name)
-       { m_player_names.remove(name); }
+       const std::list<std::string> &getPlayerNames() { return m_player_names; }
+       void addPlayerName(const std::string &name) { m_player_names.push_back(name); }
+       void removePlayerName(const std::string &name) { m_player_names.remove(name); }
        void updateCameraOffset(v3s16 camera_offset)
        { m_camera_offset = camera_offset; }
-       v3s16 getCameraOffset()
-       { return m_camera_offset; }
-
+       v3s16 getCameraOffset() const { return m_camera_offset; }
 private:
        ClientMap *m_map;
+       LocalPlayer *m_local_player;
        scene::ISceneManager *m_smgr;
        ITextureSource *m_texturesource;
        IGameDef *m_gamedef;
        IrrlichtDevice *m_irr;
-       std::map<u16, ClientActiveObject*> m_active_objects;
+       UNORDERED_MAP<u16, ClientActiveObject*> m_active_objects;
        std::vector<ClientSimpleObject*> m_simple_objects;
        std::queue<ClientEnvEvent> m_client_event_queue;
        IntervalLimiter m_active_object_light_update_interval;