From 7696a385433f815d8af8c905b45e2d7656299329 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 15 Nov 2011 23:58:56 +0200 Subject: Improve loading screen and protocol --- src/client.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/client.h') diff --git a/src/client.h b/src/client.h index b160a3bc9..625170b17 100644 --- a/src/client.h +++ b/src/client.h @@ -305,11 +305,21 @@ public: // Get event from queue. CE_NONE is returned if queue is empty. ClientEvent getClientEvent(); - inline bool accessDenied() + bool accessDenied() { return m_access_denied; } - inline std::wstring accessDeniedReason() + std::wstring accessDeniedReason() { return m_access_denied_reason; } + + float textureReceiveProgress() + { return m_texture_receive_progress; } + + bool texturesReceived() + { return m_textures_received; } + bool tooldefReceived() + { return m_tooldef_received; } + bool nodedefReceived() + { return m_nodedef_received; } float getRTT(void); @@ -367,6 +377,10 @@ private: std::wstring m_access_denied_reason; InventoryContext m_inventory_context; Queue m_client_event_queue; + float m_texture_receive_progress; + bool m_textures_received; + bool m_tooldef_received; + bool m_nodedef_received; friend class FarMesh; }; -- cgit v1.2.3