Optimize updateFastFaceRow processing by removing some TileSpec copy (#5678)

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

diff --git a/src/client.h b/src/client.h
index e7fcb597df936c61428f45d87a0ca48f87ce3e06..f5b03f19df2a0689e2e45b56ac7ae8e64896083e 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -49,7 +49,7 @@ class ClientMediaDownloader;
 struct MapDrawControl;
 class MtEventManager;
 struct PointedThing;
-class Database;
+class MapDatabase;
 class Minimap;
 struct MinimapMapblock;
 class Camera;
@@ -245,7 +245,7 @@ public:
        Client(
                        IrrlichtDevice *device,
                        const char *playername,
-                       std::string password,
+                       const std::string &password,
                        MapDrawControl &control,
                        IWritableTextureSource *tsrc,
                        IWritableShaderSource *shsrc,
@@ -311,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);
@@ -417,7 +414,8 @@ public:
        void updateCameraOffset(v3s16 camera_offset)
        { m_mesh_update_thread.m_camera_offset = camera_offset; }
 
-       // Get event from queue. CE_NONE is returned if queue is empty.
+       bool hasClientEvents() const { return !m_client_event_queue.empty(); }
+       // Get event from queue. If queue is empty, it triggers an assertion failure.
        ClientEvent getClientEvent();
 
        bool accessDenied() const { return m_access_denied; }
@@ -487,8 +485,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; }
 
@@ -514,6 +510,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
@@ -648,7 +646,7 @@ 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;