From f801e16b787f033cea4e473d69b54fe65248a439 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 25 Mar 2012 11:50:29 +0300
Subject: Texture cache -> Media cache WIP

---
 src/client.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/client.h')

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;
-- 
cgit v1.2.3