summaryrefslogtreecommitdiff
path: root/src/client.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-15 23:58:56 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:45 +0200
commit7696a385433f815d8af8c905b45e2d7656299329 (patch)
tree7d211d46b1e86c9d07bff5e66198771d501e6bd2 /src/client.h
parentcde35d160600bb97c62c48fd1924c98d23a6ac98 (diff)
downloadminetest-7696a385433f815d8af8c905b45e2d7656299329.tar.gz
minetest-7696a385433f815d8af8c905b45e2d7656299329.tar.bz2
minetest-7696a385433f815d8af8c905b45e2d7656299329.zip
Improve loading screen and protocol
Diffstat (limited to 'src/client.h')
-rw-r--r--src/client.h18
1 files changed, 16 insertions, 2 deletions
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<ClientEvent> m_client_event_queue;
+ float m_texture_receive_progress;
+ bool m_textures_received;
+ bool m_tooldef_received;
+ bool m_nodedef_received;
friend class FarMesh;
};