diff options
author | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 11:50:29 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 11:51:33 +0300 |
commit | f801e16b787f033cea4e473d69b54fe65248a439 (patch) | |
tree | 25cd83a122fd4a1cb74d605aecaa65caa1b5f8a7 /src/client.h | |
parent | 4bf5065a9cdaf55a6915e647e9b5de5281d6622f (diff) | |
download | minetest-f801e16b787f033cea4e473d69b54fe65248a439.tar.gz minetest-f801e16b787f033cea4e473d69b54fe65248a439.tar.bz2 minetest-f801e16b787f033cea4e473d69b54fe65248a439.zip |
Texture cache -> Media cache WIP
Diffstat (limited to 'src/client.h')
-rw-r--r-- | src/client.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/client.h b/src/client.h index 8d7597e80..b15dbed54 100644 --- a/src/client.h +++ b/src/client.h @@ -290,11 +290,11 @@ public: std::wstring accessDeniedReason() { return m_access_denied_reason; } - float textureReceiveProgress() - { return m_texture_receive_progress; } + float mediaReceiveProgress() + { return m_media_receive_progress; } bool texturesReceived() - { return m_textures_received; } + { return m_media_received; } bool itemdefReceived() { return m_itemdef_received; } bool nodedefReceived() @@ -367,12 +367,11 @@ private: bool m_access_denied; std::wstring m_access_denied_reason; Queue<ClientEvent> m_client_event_queue; - FileCache m_texture_cache; - // a map of the name and SHA1 checksum of each texture; - // cleared after content has been recieved - core::map<std::string, std::string> m_texture_name_sha1_map; - float m_texture_receive_progress; - bool m_textures_received; + FileCache m_media_cache; + // Mapping from media file name to SHA1 checksum + core::map<std::string, std::string> m_media_name_sha1_map; + float m_media_receive_progress; + bool m_media_received; bool m_itemdef_received; bool m_nodedef_received; friend class FarMesh; |