Don't erase modified_blocks

[minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index 18a0009a83123b62682ad5fc9cd5c6fa2ae03538..570a6b3b0847055336bf1eee6e0a2d7b469f6da1 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -33,12 +33,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "filecache.h"
 #include "localplayer.h"
+#include "server.h"
+#include "particles.h"
 #include "util/pointedthing.h"
+#include <algorithm>
 
 struct MeshMakeData;
 class MapBlockMesh;
 class IGameDef;
 class IWritableTextureSource;
+class IWritableShaderSource;
 class IWritableItemDefManager;
 class IWritableNodeDefManager;
 //class IWritableCraftDefManager;
@@ -128,13 +132,32 @@ class MeshUpdateThread : public SimpleThread
        IGameDef *m_gamedef;
 };
 
+class MediaFetchThread : public SimpleThread
+{
+public:
+
+       MediaFetchThread(IGameDef *gamedef):
+               m_gamedef(gamedef)
+       {
+       }
+
+       void * Thread();
+
+       std::list<MediaRequest> m_file_requests;
+       MutexedQueue<std::pair<std::string, std::string> > m_file_data;
+       std::list<MediaRequest> m_failed;
+       std::string m_remote_url;
+       IGameDef *m_gamedef;
+};
+
 enum ClientEventType
 {
        CE_NONE,
        CE_PLAYER_DAMAGE,
        CE_PLAYER_FORCE_MOVE,
        CE_DEATHSCREEN,
-       CE_TEXTURES_UPDATED
+       CE_TEXTURES_UPDATED,
+       CE_SHOW_FORMSPEC
 };
 
 struct ClientEvent
@@ -156,6 +179,10 @@ struct ClientEvent
                        f32 camera_point_target_y;
                        f32 camera_point_target_z;
                } deathscreen;
+               struct{
+                       std::string* formspec;
+                       std::string* formname;
+               } show_formspec;
                struct{
                } textures_updated;
        };
@@ -174,6 +201,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                        std::string password,
                        MapDrawControl &control,
                        IWritableTextureSource *tsrc,
+                       IWritableShaderSource *shsrc,
                        IWritableItemDefManager *itemdef,
                        IWritableNodeDefManager *nodedef,
                        ISoundManager *sound,
@@ -212,6 +240,8 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        void sendNodemetaFields(v3s16 p, const std::string &formname,
                        const std::map<std::string, std::string> &fields);
+       void sendInventoryFields(const std::string &formname,
+                       const std::map<std::string, std::string> &fields);
        void sendInventoryAction(InventoryAction *a);
        void sendChatMessage(const std::wstring &message);
        void sendChangePassword(const std::wstring oldpassword,
@@ -253,7 +283,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // Prints a line or two of info
        void printDebugInfo(std::ostream &os);
 
-       core::list<std::wstring> getConnectedPlayerNames();
+       std::list<std::wstring> getConnectedPlayerNames();
 
        float getAnimationTime();
 
@@ -285,10 +315,13 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        { return m_access_denied_reason; }
 
        float mediaReceiveProgress()
-       { return m_media_receive_progress; }
+       {
+               if (!m_media_receive_started) return 0;
+               return 1.0 * m_media_received_count / m_media_count;
+       }
 
        bool texturesReceived()
-       { return m_media_received; }
+       { return m_media_receive_started && m_media_received_count == m_media_count; }
        bool itemdefReceived()
        { return m_itemdef_received; }
        bool nodedefReceived()
@@ -303,6 +336,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        virtual INodeDefManager* getNodeDefManager();
        virtual ICraftDefManager* getCraftDefManager();
        virtual ITextureSource* getTextureSource();
+       virtual IShaderSource* getShaderSource();
        virtual u16 allocateUnknownNodeId(const std::string &name);
        virtual ISoundManager* getSoundManager();
        virtual MtEventManager* getEventManager();
@@ -313,7 +347,9 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        
        // Insert a media file appropriately into the appropriate manager
        bool loadMedia(const std::string &data, const std::string &filename);
-       
+
+       void request_media(const std::list<MediaRequest> &file_requests);
+
        // Virtual methods from con::PeerHandler
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
@@ -335,12 +371,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        IntervalLimiter m_map_timer_and_unload_interval;
 
        IWritableTextureSource *m_tsrc;
+       IWritableShaderSource *m_shsrc;
        IWritableItemDefManager *m_itemdef;
        IWritableNodeDefManager *m_nodedef;
        ISoundManager *m_sound;
        MtEventManager *m_event;
 
        MeshUpdateThread m_mesh_update_thread;
+       std::list<MediaFetchThread*> m_media_fetch_threads;
        ClientEnvironment m_env;
        con::Connection m_con;
        IrrlichtDevice *m_device;
@@ -350,7 +388,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        bool m_inventory_updated;
        Inventory *m_inventory_from_server;
        float m_inventory_from_server_age;
-       core::map<v3s16, bool> m_active_blocks;
+       std::set<v3s16> m_active_blocks;
        PacketCounter m_packetcounter;
        // Block mesh animation parameters
        float m_animation_time;
@@ -368,9 +406,10 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        Queue<ClientEvent> m_client_event_queue;
        FileCache m_media_cache;
        // Mapping from media file name to SHA1 checksum
-       core::map<std::string, std::string> m_media_name_sha1_map;
-       float m_media_receive_progress;
-       bool m_media_received;
+       std::map<std::string, std::string> m_media_name_sha1_map;
+       bool m_media_receive_started;
+       u32 m_media_count;
+       u32 m_media_received_count;
        bool m_itemdef_received;
        bool m_nodedef_received;
        friend class FarMesh;
@@ -380,6 +419,9 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        float m_last_time_of_day_f;
        float m_time_of_day_update_timer;
 
+       // An interval for generally sending object positions and stuff
+       float m_recommended_send_interval;
+
        // Sounds
        float m_removed_sounds_check_timer;
        // Mapping from server sound ids to our sound ids
@@ -391,6 +433,10 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        // Privileges
        std::set<std::string> m_privileges;
+
+       // Detached inventories
+       // key = name
+       std::map<std::string, Inventory*> m_detached_inventories;
 };
 
 #endif // !CLIENT_HEADER