Do not shade inventory items with textures (#5869)

[minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index 7cbfadd50fd36f98d636388c12b8b572c0c9868b..b4145c76ff207127c08084f2dfcdb9f29e72e053 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -38,6 +38,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tileanimation.h"
 #include "mesh_generator_thread.h"
 
+#define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f
+
 struct MeshMakeData;
 class MapBlockMesh;
 class IWritableTextureSource;
@@ -174,6 +176,7 @@ struct ClientEvent
                        video::SColor *bgcolor;
                        std::string *type;
                        std::vector<std::string> *params;
+                       bool clouds;
                } set_sky;
                struct{
                        bool do_override;
@@ -256,6 +259,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                        IrrlichtDevice *device,
                        const char *playername,
                        const std::string &password,
+                       const std::string &address_name,
                        MapDrawControl &control,
                        IWritableTextureSource *tsrc,
                        IWritableShaderSource *shsrc,
@@ -283,9 +287,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                The name of the local player should already be set when
                calling this, as it is sent in the initialization.
        */
-       void connect(Address address,
-                       const std::string &address_name,
-                       bool is_local_server);
+       void connect(Address address, bool is_local_server);
 
        /*
                Stuff that references the environment is valid only as
@@ -328,6 +330,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        void handleCommand_ItemDef(NetworkPacket* pkt);
        void handleCommand_PlaySound(NetworkPacket* pkt);
        void handleCommand_StopSound(NetworkPacket* pkt);
+       void handleCommand_FadeSound(NetworkPacket *pkt);
        void handleCommand_Privileges(NetworkPacket* pkt);
        void handleCommand_InventoryFormSpec(NetworkPacket* pkt);
        void handleCommand_DetachedInventory(NetworkPacket* pkt);
@@ -359,6 +362,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                const StringMap &fields);
        void sendInventoryAction(InventoryAction *a);
        void sendChatMessage(const std::wstring &message);
+       void clearOutChatQueue();
        void sendChangePassword(const std::string &oldpassword,
                const std::string &newpassword);
        void sendDamage(u8 damage);
@@ -466,8 +470,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        Minimap* getMinimap() { return m_minimap; }
        void setCamera(Camera* camera) { m_camera = camera; }
 
-       Camera* getCamera ()
-       { return m_camera; }
+       Camera* getCamera () { return m_camera; }
 
        bool shouldShowMinimap() const;
 
@@ -523,6 +526,16 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        IrrlichtDevice *getDevice() const { return m_device; }
 
+       const Address getServerAddress()
+       {
+               return m_con.GetPeerAddress(PEER_ID_SERVER);
+       }
+
+       const std::string &getAddressName() const
+       {
+               return m_address_name;
+       }
+
 private:
 
        // Virtual methods from con::PeerHandler
@@ -555,6 +568,8 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        inline std::string getPlayerName()
        { return m_env.getLocalPlayer()->getName(); }
 
+       bool canSendChatMessage() const;
+
        float m_packetcounter_timer;
        float m_connection_reinit_timer;
        float m_avg_rtt_timer;
@@ -574,6 +589,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        ClientEnvironment m_env;
        ParticleManager m_particle_manager;
        con::Connection m_con;
+       std::string m_address_name;
        IrrlichtDevice *m_device;
        Camera *m_camera;
        Minimap *m_minimap;
@@ -601,6 +617,9 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        //s32 m_daynight_i;
        //u32 m_daynight_ratio;
        std::queue<std::wstring> m_chat_queue;
+       std::queue<std::wstring> m_out_chat_queue;
+       u32 m_last_chat_message_sent;
+       float m_chat_message_allowance;
 
        // The authentication methods we can use to enter sudo mode (=change password)
        u32 m_sudo_auth_methods;