Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

[oweals/minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index b1310424d4cc08aca1a9e92e7af5e9ff1b33bcfc..699550eacec07b14329e8f6374041c6e45ab6630 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "particles.h"
 #include "mapnode.h"
 #include "tileanimation.h"
+#include "mesh_generator_thread.h"
 
 struct MeshMakeData;
 class MapBlockMesh;
@@ -48,93 +49,18 @@ class ClientMediaDownloader;
 struct MapDrawControl;
 class MtEventManager;
 struct PointedThing;
-class Database;
+class MapDatabase;
 class Minimap;
 struct MinimapMapblock;
 class Camera;
 class NetworkPacket;
 
-struct QueuedMeshUpdate
-{
-       v3s16 p;
-       MeshMakeData *data;
-       bool ack_block_to_server;
-
-       QueuedMeshUpdate();
-       ~QueuedMeshUpdate();
-};
-
 enum LocalClientState {
        LC_Created,
        LC_Init,
        LC_Ready
 };
 
-/*
-       A thread-safe queue of mesh update tasks
-*/
-class MeshUpdateQueue
-{
-public:
-       MeshUpdateQueue();
-
-       ~MeshUpdateQueue();
-
-       /*
-               peer_id=0 adds with nobody to send to
-       */
-       void addBlock(v3s16 p, MeshMakeData *data,
-                       bool ack_block_to_server, bool urgent);
-
-       // Returned pointer must be deleted
-       // Returns NULL if queue is empty
-       QueuedMeshUpdate * pop();
-
-       u32 size()
-       {
-               MutexAutoLock lock(m_mutex);
-               return m_queue.size();
-       }
-
-private:
-       std::vector<QueuedMeshUpdate*> m_queue;
-       std::set<v3s16> m_urgents;
-       Mutex m_mutex;
-};
-
-struct MeshUpdateResult
-{
-       v3s16 p;
-       MapBlockMesh *mesh;
-       bool ack_block_to_server;
-
-       MeshUpdateResult():
-               p(-1338,-1338,-1338),
-               mesh(NULL),
-               ack_block_to_server(false)
-       {
-       }
-};
-
-class MeshUpdateThread : public UpdateThread
-{
-private:
-       MeshUpdateQueue m_queue_in;
-
-protected:
-       virtual void doUpdate();
-
-public:
-
-       MeshUpdateThread() : UpdateThread("Mesh") {}
-
-       void enqueueUpdate(v3s16 p, MeshMakeData *data,
-                       bool ack_block_to_server, bool urgent);
-       MutexedQueue<MeshUpdateResult> m_queue_out;
-
-       v3s16 m_camera_offset;
-};
-
 enum ClientEventType
 {
        CE_NONE,
@@ -307,7 +233,7 @@ private:
 };
 
 class ClientScripting;
-class GameUIFlags;
+struct GameUIFlags;
 
 class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 {
@@ -319,7 +245,7 @@ public:
        Client(
                        IrrlichtDevice *device,
                        const char *playername,
-                       std::string password,
+                       const std::string &password,
                        MapDrawControl &control,
                        IWritableTextureSource *tsrc,
                        IWritableShaderSource *shsrc,
@@ -385,13 +311,10 @@ public:
        void handleCommand_HP(NetworkPacket* pkt);
        void handleCommand_Breath(NetworkPacket* pkt);
        void handleCommand_MovePlayer(NetworkPacket* pkt);
-       void handleCommand_PlayerItem(NetworkPacket* pkt);
        void handleCommand_DeathScreen(NetworkPacket* pkt);
        void handleCommand_AnnounceMedia(NetworkPacket* pkt);
        void handleCommand_Media(NetworkPacket* pkt);
-       void handleCommand_ToolDef(NetworkPacket* pkt);
        void handleCommand_NodeDef(NetworkPacket* pkt);
-       void handleCommand_CraftItemDef(NetworkPacket* pkt);
        void handleCommand_ItemDef(NetworkPacket* pkt);
        void handleCommand_PlaySound(NetworkPacket* pkt);
        void handleCommand_StopSound(NetworkPacket* pkt);
@@ -470,6 +393,7 @@ public:
        float getAnimationTime();
 
        int getCrackLevel();
+       v3s16 getCrackPos();
        void setCrack(int level, v3s16 pos);
 
        u16 getHP();
@@ -560,8 +484,6 @@ public:
        bool loadMedia(const std::string &data, const std::string &filename);
        // Send a request for conventional media transfer
        void request_media(const std::vector<std::string> &file_requests);
-       // Send a notification that no conventional media transfer is needed
-       void received_media();
 
        LocalClientState getState() { return m_state; }
 
@@ -587,6 +509,8 @@ public:
        void showGameFog(const bool show = true);
        void showGameDebug(const bool show = true);
 
+       IrrlichtDevice *getDevice() const { return m_device; }
+
 private:
 
        // Virtual methods from con::PeerHandler
@@ -721,21 +645,17 @@ private:
        LocalClientState m_state;
 
        // Used for saving server map to disk client-side
-       Database *m_localdb;
+       MapDatabase *m_localdb;
        IntervalLimiter m_localdb_save_interval;
        u16 m_cache_save_interval;
 
-       // TODO: Add callback to update these when g_settings changes
-       bool m_cache_smooth_lighting;
-       bool m_cache_enable_shaders;
-       bool m_cache_use_tangent_vertices;
-
        ClientScripting *m_script;
        bool m_modding_enabled;
        UNORDERED_MAP<std::string, ModMetadata *> m_mod_storages;
        float m_mod_storage_save_timer;
        GameUIFlags *m_game_ui_flags;
 
+       bool m_shutdown;
        DISABLE_CLASS_COPY(Client);
 };