Update ContentFeatures serialization format now as PROTOCOL_VERSION was changed

[minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index 8d7597e807846a2884d7e0ed4973ff3919862b56..154c8bb003646bd580e563ee3a0841dfeda548ad 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010 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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,21 +20,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENT_HEADER
 #define CLIENT_HEADER
 
-#ifndef SERVER
-
 #include "connection.h"
 #include "environment.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "jmutex.h"
 #include <ostream>
 #include <set>
 #include <vector>
 #include "clientobject.h"
-#include "utility.h" // For IntervalLimiter
 #include "gamedef.h"
 #include "inventorymanager.h"
 #include "filesys.h"
 #include "filecache.h"
+#include "localplayer.h"
+#include "util/pointedthing.h"
 
 struct MeshMakeData;
 class MapBlockMesh;
@@ -211,11 +210,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        void interact(u8 action, const PointedThing& pointed);
 
-       void sendSignNodeText(v3s16 p, std::string text);
+       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,
-               const std::wstring newpassword);
+                       const std::wstring newpassword);
        void sendDamage(u8 damage);
        void sendRespawn();
 
@@ -262,14 +264,8 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        u16 getHP();
 
-       float getAvgRtt()
-       {
-               try{
-                       return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
-               } catch(con::PeerNotFoundException){
-                       return 1337;
-               }
-       }
+       bool checkPrivilege(const std::string &priv)
+       { return (m_privileges.count(priv) != 0); }
 
        bool getChatMessage(std::wstring &message);
        void typeChatMessage(const std::wstring& message);
@@ -290,11 +286,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        std::wstring accessDeniedReason()
        { return m_access_denied_reason; }
 
-       float textureReceiveProgress()
-       { return m_texture_receive_progress; }
+       float mediaReceiveProgress()
+       { return m_media_receive_progress; }
 
        bool texturesReceived()
-       { return m_textures_received; }
+       { return m_media_received; }
        bool itemdefReceived()
        { return m_itemdef_received; }
        bool nodedefReceived()
@@ -312,9 +308,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        virtual u16 allocateUnknownNodeId(const std::string &name);
        virtual ISoundManager* getSoundManager();
        virtual MtEventManager* getEventManager();
+       virtual bool checkLocalPrivilege(const std::string &priv)
+       { return checkPrivilege(priv); }
 
 private:
        
+       // Insert a media file appropriately into the appropriate manager
+       bool loadMedia(const std::string &data, const std::string &filename);
+       
        // Virtual methods from con::PeerHandler
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
@@ -367,12 +368,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        bool m_access_denied;
        std::wstring m_access_denied_reason;
        Queue<ClientEvent> m_client_event_queue;
-       FileCache m_texture_cache;
-       // a map of the name and SHA1 checksum of each texture;
-       // cleared after content has been recieved
-       core::map<std::string, std::string> m_texture_name_sha1_map;
-       float m_texture_receive_progress;
-       bool m_textures_received;
+       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;
        bool m_itemdef_received;
        bool m_nodedef_received;
        friend class FarMesh;
@@ -390,9 +390,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        std::map<int, s32> m_sounds_client_to_server;
        // And relations to objects
        std::map<int, u16> m_sounds_to_objects;
-};
 
-#endif // !SERVER
+       // Privileges
+       std::set<std::string> m_privileges;
+
+       // Detached inventories
+       // key = name
+       std::map<std::string, Inventory*> m_detached_inventories;
+};
 
 #endif // !CLIENT_HEADER