Remove Android makefile ugly make -j hack

[minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index fd43361b11f68d9c65c22a2d87e45b52283055e8..ab584267822531038851c81d310af15de64306f3 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENT_HEADER
 #define CLIENT_HEADER
 
-#include "connection.h"
+#include "network/connection.h"
 #include "environment.h"
 #include "irrlichttypes_extrabloated.h"
 #include "jthread/jmutex.h"
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "localplayer.h"
 #include "hud.h"
 #include "particles.h"
-#include "network/toclientpacket.h"
+#include "network/networkpacket.h"
 
 struct MeshMakeData;
 class MapBlockMesh;
@@ -48,7 +48,6 @@ struct MapDrawControl;
 class MtEventManager;
 struct PointedThing;
 class Database;
-class Server;
 
 struct QueuedMeshUpdate
 {
@@ -346,57 +345,59 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
         * Command Handlers
         */
 
-       void handleCommand(ToClientPacket* pkt);
-
-       void handleCommand_Null(ToClientPacket* pkt) {};
-       void handleCommand_Deprecated(ToClientPacket* pkt);
-       void handleCommand_Init(ToClientPacket* pkt);
-       void handleCommand_AccessDenied(ToClientPacket* pkt);
-       void handleCommand_RemoveNode(ToClientPacket* pkt);
-       void handleCommand_AddNode(ToClientPacket* pkt);
-       void handleCommand_BlockData(ToClientPacket* pkt);
-       void handleCommand_Inventory(ToClientPacket* pkt);
-       void handleCommand_TimeOfDay(ToClientPacket* pkt);
-       void handleCommand_ChatMessage(ToClientPacket* pkt);
-       void handleCommand_ActiveObjectRemoveAdd(ToClientPacket* pkt);
-       void handleCommand_ActiveObjectMessages(ToClientPacket* pkt);
-       void handleCommand_Movement(ToClientPacket* pkt);
-       void handleCommand_HP(ToClientPacket* pkt);
-       void handleCommand_Breath(ToClientPacket* pkt);
-       void handleCommand_MovePlayer(ToClientPacket* pkt);
-       void handleCommand_PlayerItem(ToClientPacket* pkt);
-       void handleCommand_DeathScreen(ToClientPacket* pkt);
-       void handleCommand_AnnounceMedia(ToClientPacket* pkt);
-       void handleCommand_Media(ToClientPacket* pkt);
-       void handleCommand_ToolDef(ToClientPacket* pkt);
-       void handleCommand_NodeDef(ToClientPacket* pkt);
-       void handleCommand_CraftItemDef(ToClientPacket* pkt);
-       void handleCommand_ItemDef(ToClientPacket* pkt);
-       void handleCommand_PlaySound(ToClientPacket* pkt);
-       void handleCommand_StopSound(ToClientPacket* pkt);
-       void handleCommand_Privileges(ToClientPacket* pkt);
-       void handleCommand_InventoryFormSpec(ToClientPacket* pkt);
-       void handleCommand_DetachedInventory(ToClientPacket* pkt);
-       void handleCommand_ShowFormSpec(ToClientPacket* pkt);
-       void handleCommand_SpawnParticle(ToClientPacket* pkt);
-       void handleCommand_AddParticleSpawner(ToClientPacket* pkt);
-       void handleCommand_DeleteParticleSpawner(ToClientPacket* pkt);
-       void handleCommand_HudAdd(ToClientPacket* pkt);
-       void handleCommand_HudRemove(ToClientPacket* pkt);
-       void handleCommand_HudChange(ToClientPacket* pkt);
-       void handleCommand_HudSetFlags(ToClientPacket* pkt);
-       void handleCommand_HudSetParam(ToClientPacket* pkt);
-       void handleCommand_HudSetSky(ToClientPacket* pkt);
-       void handleCommand_OverrideDayNightRatio(ToClientPacket* pkt);
-       void handleCommand_LocalPlayerAnimations(ToClientPacket* pkt);
-       void handleCommand_EyeOffset(ToClientPacket* pkt);
+       void handleCommand(NetworkPacket* pkt);
+
+       void handleCommand_Null(NetworkPacket* pkt) {};
+       void handleCommand_Deprecated(NetworkPacket* pkt);
+       void handleCommand_Hello(NetworkPacket* pkt);
+       void handleCommand_AuthAccept(NetworkPacket* pkt);
+       void handleCommand_InitLegacy(NetworkPacket* pkt);
+       void handleCommand_AccessDenied(NetworkPacket* pkt);
+       void handleCommand_RemoveNode(NetworkPacket* pkt);
+       void handleCommand_AddNode(NetworkPacket* pkt);
+       void handleCommand_BlockData(NetworkPacket* pkt);
+       void handleCommand_Inventory(NetworkPacket* pkt);
+       void handleCommand_TimeOfDay(NetworkPacket* pkt);
+       void handleCommand_ChatMessage(NetworkPacket* pkt);
+       void handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt);
+       void handleCommand_ActiveObjectMessages(NetworkPacket* pkt);
+       void handleCommand_Movement(NetworkPacket* pkt);
+       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);
+       void handleCommand_Privileges(NetworkPacket* pkt);
+       void handleCommand_InventoryFormSpec(NetworkPacket* pkt);
+       void handleCommand_DetachedInventory(NetworkPacket* pkt);
+       void handleCommand_ShowFormSpec(NetworkPacket* pkt);
+       void handleCommand_SpawnParticle(NetworkPacket* pkt);
+       void handleCommand_AddParticleSpawner(NetworkPacket* pkt);
+       void handleCommand_DeleteParticleSpawner(NetworkPacket* pkt);
+       void handleCommand_HudAdd(NetworkPacket* pkt);
+       void handleCommand_HudRemove(NetworkPacket* pkt);
+       void handleCommand_HudChange(NetworkPacket* pkt);
+       void handleCommand_HudSetFlags(NetworkPacket* pkt);
+       void handleCommand_HudSetParam(NetworkPacket* pkt);
+       void handleCommand_HudSetSky(NetworkPacket* pkt);
+       void handleCommand_OverrideDayNightRatio(NetworkPacket* pkt);
+       void handleCommand_LocalPlayerAnimations(NetworkPacket* pkt);
+       void handleCommand_EyeOffset(NetworkPacket* pkt);
 
        void ProcessData(u8 *data, u32 datasize, u16 sender_peer_id);
 
        // Returns true if something was received
        bool AsyncProcessPacket();
        bool AsyncProcessData();
-       void Send(u16 channelnum, SharedBuffer<u8> data, bool reliable);
+       void Send(NetworkPacket* pkt);
 
        void interact(u8 action, const PointedThing& pointed);
 
@@ -491,7 +492,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        float mediaReceiveProgress();
 
-       void afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font);
+       void afterContentReceived(IrrlichtDevice *device);
 
        float getRTT(void);
        float getCurRate(void);
@@ -516,7 +517,7 @@ 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);
        // Send a request for conventional media transfer
-       void request_media(const std::list<std::string> &file_requests);
+       void request_media(const std::vector<std::string> &file_requests);
        // Send a notification that no conventional media transfer is needed
        void received_media();
 
@@ -541,6 +542,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // Send the item number 'item' as player item to the server
        void sendPlayerItem(u16 item);
 
+       void sendLegacyInit(const char* playerName, const char* playerPassword);
+       void sendDeletedBlocks(std::vector<v3s16> &blocks);
+       void sendGotBlocks(v3s16 block);
+       void sendRemovedSounds(std::vector<s32> &soundList);
+
        float m_packetcounter_timer;
        float m_connection_reinit_timer;
        float m_avg_rtt_timer;
@@ -578,13 +584,13 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT
        //s32 m_daynight_i;
        //u32 m_daynight_ratio;
-       Queue<std::wstring> m_chat_queue;
+       std::queue<std::wstring> m_chat_queue;
        // The seed returned by the server in TOCLIENT_INIT is stored here
        u64 m_map_seed;
        std::string m_password;
        bool m_access_denied;
        std::wstring m_access_denied_reason;
-       Queue<ClientEvent> m_client_event_queue;
+       std::queue<ClientEvent> m_client_event_queue;
        bool m_itemdef_received;
        bool m_nodedef_received;
        ClientMediaDownloader *m_media_downloader;
@@ -620,11 +626,13 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        LocalClientState m_state;
 
        // Used for saving server map to disk client-side
-       Database *localdb;
-       Server *localserver;
+       Database *m_localdb;
+       IntervalLimiter m_localdb_save_interval;
+       u16 m_cache_save_interval;
 
-       // TODO: Add callback to update this when g_settings changes
+       // TODO: Add callback to update these when g_settings changes
        bool m_cache_smooth_lighting;
+       bool m_cache_enable_shaders;
 };
 
 #endif // !CLIENT_HEADER