Resource download fix.

Author: Bamcane

src/game/client/components/resource.cpp

@@ -70,18 +70,6 @@ void CClientResManager::RenderImageEntity(const CNetObj_CustomImageEntity *pPrev
 	Graphics()->QuadsEnd();
 }
 
-void CClientResManager::OnMapLoad()
-{
-    for(int i = 0; i < m_lResources.size(); i++)
-    {
-        if(m_lResources[i].m_Sample.IsValid())
-            m_pClient->m_pSounds->UnloadSample(&m_lResources[i].m_Sample);
-        if(m_lResources[i].m_Texture.IsValid())
-            Graphics()->UnloadTexture(&m_lResources[i].m_Texture);
-    }
-    m_lResources.clear();
-}
-
 void CClientResManager::OnRender()
 {
 	int Num = Client()->SnapNumItems(IClient::SNAP_CURRENT);
@@ -122,15 +110,11 @@ void CClientResManager::OnMessage(int MsgType, void *pRawMsg)
             Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "resource", "invalid resource size");
             return;
         }
+
+        if(FindResource(*static_cast<const Uuid *>(pMsg->m_Uuid))) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
         {
-            CClientResource TargetRes;
-            TargetRes.m_Uuid = *static_cast<const Uuid *>(pMsg->m_Uuid);
-            sorted_array<CClientResource>::range r = ::find_binary(m_lResources.all(), TargetRes);
-            if(!r.empty()) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-            {
-                Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "resource", "invalid resource uuid");
-                return;
-            }
+            Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "resource", "invalid resource uuid");
+            return;
         }
         CClientResource Resource;
         str_copy(Resource.m_aName, pMsg->m_Name, sizeof(Resource.m_aName));
@@ -146,6 +130,7 @@ void CClientResManager::OnMessage(int MsgType, void *pRawMsg)
         mem_copy(&Resource.m_Sha256, pMsg->m_Sha256, sizeof(SHA256_DIGEST));
         FormatResourcePath(Resource.m_aPath, sizeof(Resource.m_aPath), Resource.m_aName, false, &Resource.m_Sha256, &Resource.m_Crc);
         FormatResourcePath(Resource.m_aTempPath, sizeof(Resource.m_aTempPath), Resource.m_aName, true, &Resource.m_Sha256, &Resource.m_Crc);
+        Resource.m_DownloadTemp = 0;
 
         int Index = m_lResources.add(Resource);
         if(!LoadResource(&m_lResources[Index]))
@@ -158,41 +143,38 @@ void CClientResManager::OnMessage(int MsgType, void *pRawMsg)
     {
 		CNetMsg_Sv_CustomResourceData *pMsg = (CNetMsg_Sv_CustomResourceData *) pRawMsg;
         Uuid TargetResource = *static_cast<const Uuid *>(pMsg->m_Uuid);
-
-        CClientResource TargetRes;
-        TargetRes.m_Uuid = TargetResource;
-        sorted_array<CClientResource>::range r = ::find_binary(m_lResources.all(), TargetRes);
-        if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
+        CClientResource *pResource = FindResource(TargetResource);
+        if(!pResource)
             return;
-
-        CClientResource &Resource = r.front();
-        Resource.m_DownloadedSize += pMsg->m_DataSize;
-        if(Resource.m_DownloadedSize > Resource.m_DataSize)
+        pResource->m_DownloadedSize += pMsg->m_DataSize;
+        if(pResource->m_DownloadedSize > pResource->m_DataSize)
         {
-            io_close(Resource.m_DownloadTemp);
-            Storage()->RemoveFile(Resource.m_aTempPath, IStorage::TYPE_SAVE);
-            m_lResources.remove(Resource);
+            io_close(pResource->m_DownloadTemp);
+            pResource->m_DownloadTemp = 0;
+            Storage()->RemoveFile(pResource->m_aTempPath, IStorage::TYPE_SAVE);
+            m_lResources.remove(*pResource);
             return; // invalid!
         }
-        io_write(Resource.m_DownloadTemp, pMsg->m_Data, pMsg->m_DataSize);
-        if(Resource.m_DownloadedSize == Resource.m_DataSize)
+        io_write(pResource->m_DownloadTemp, pMsg->m_Data, pMsg->m_DataSize);
+        if(pResource->m_DownloadedSize == pResource->m_DataSize)
         {
             char aBuf[128];
-            str_format(aBuf, sizeof(aBuf), Localize("Resource '%s': download complete"), Resource.m_aName);
+            str_format(aBuf, sizeof(aBuf), Localize("Resource '%s': download complete"), pResource->m_aName);
             UI()->DoToast(aBuf);
-            io_close(Resource.m_DownloadTemp);
+            io_close(pResource->m_DownloadTemp);
+            pResource->m_DownloadTemp = 0;
 
-            Storage()->RemoveFile(Resource.m_aPath, IStorage::TYPE_SAVE);
-            Storage()->RenameFile(Resource.m_aTempPath, Resource.m_aPath, IStorage::TYPE_SAVE);
+            Storage()->RemoveFile(pResource->m_aPath, IStorage::TYPE_SAVE);
+            Storage()->RenameFile(pResource->m_aTempPath, pResource->m_aPath, IStorage::TYPE_SAVE);
 
-            if(!LoadResource(&Resource))
+            if(!LoadResource(pResource))
             {
-                Storage()->RemoveFile(Resource.m_aPath, IStorage::TYPE_SAVE);
-                m_lResources.remove(Resource);
+                Storage()->RemoveFile(pResource->m_aPath, IStorage::TYPE_SAVE);
+                m_lResources.remove(*pResource);
                 return; // invalid!
             }
         }
-        else if((pMsg->m_ChunkIndex + 1) % Resource.m_ChunkPerRequest == 0)
+        else if((pMsg->m_ChunkIndex + 1) % pResource->m_ChunkPerRequest == 0)
             RequestDownload(&TargetResource);
     }
 }
@@ -220,42 +202,28 @@ void CClientResManager::OnStateChange(int NewState, int OldState)
     }
 }
 
-bool CClientResManager::IsResourceSound(Uuid ResID)
+CClientResManager::CClientResource *CClientResManager::FindResource(Uuid ResourceID)
 {
-	CClientResource Res;
-	Res.m_Uuid = ResID;
-	sorted_array<CClientResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return false;
-	return r.front().m_Type == RESOURCE_SOUND;
-}
-
-bool CClientResManager::IsResourceImage(Uuid ResID)
-{
-	CClientResource Res;
-	Res.m_Uuid = ResID;
-	sorted_array<CClientResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return false;
-	return r.front().m_Type == RESOURCE_IMAGE;
+	for(int i = 0; i < m_lResources.size(); i++)
+    {
+        if(m_lResources[i].m_Uuid == ResourceID)
+            return &m_lResources[i];
+    }
+    return nullptr;
 }
 
 ISound::CSampleHandle CClientResManager::GetResourceSample(Uuid ResID)
 {
-	CClientResource Res;
-	Res.m_Uuid = ResID;
-	sorted_array<CClientResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return ISound::CSampleHandle();
-	return r.front().m_Sample;
+    CClientResource *pResource = FindResource(ResID);
+    if(pResource)
+	    return pResource->m_Sample;
+    return ISound::CSampleHandle();
 }
 
 IGraphics::CTextureHandle CClientResManager::GetResourceTexture(Uuid ResID)
 {
-	CClientResource Res;
-	Res.m_Uuid = ResID;
-	sorted_array<CClientResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return IGraphics::CTextureHandle();
-	return r.front().m_Texture;
+    CClientResource *pResource = FindResource(ResID);
+    if(pResource)
+	    return pResource->m_Texture;
+    return IGraphics::CTextureHandle();
 }

src/game/client/components/resource.h

@@ -1,7 +1,7 @@
 #ifndef GAME_CLIENT_COMPONENTS_RESOURCE_H
 #define GAME_CLIENT_COMPONENTS_RESOURCE_H
 
-#include <base/tl/sorted_array.h>
+#include <base/tl/array.h>
 #include <base/uuid.h>
 #include <engine/graphics.h>
 #include <engine/sound.h>
@@ -21,20 +21,18 @@ class CClientResManager : public CComponent
         IOHANDLE m_DownloadTemp;
     };
 
-    sorted_array<CClientResource> m_lResources;
+    array<CClientResource> m_lResources;
     void RequestDownload(const Uuid *pRequest);
     bool LoadResource(CClientResource *pResource);
 
     void RenderImageEntity(const CNetObj_CustomImageEntity *pPrev, const CNetObj_CustomImageEntity *pCur);
 public:
     CClientResManager();
-    virtual void OnMapLoad();
     virtual void OnRender();
 	virtual void OnMessage(int MsgType, void *pRawMsg);
 	virtual void OnStateChange(int NewState, int OldState);
+    CClientResource *FindResource(Uuid ResourceID);
 
-    bool IsResourceSound(Uuid ResID);
-    bool IsResourceImage(Uuid ResID);
     ISound::CSampleHandle GetResourceSample(Uuid ResID);
     IGraphics::CTextureHandle GetResourceTexture(Uuid ResID);
 };

src/game/server/gamecontext.cpp

@@ -186,7 +186,7 @@ void CGameContext::CreateSound(vec2 Pos, int Sound, int64 Mask)
 
 void CGameContext::CreateCustomSound(vec2 Pos, Uuid Sound, int64 Mask)
 {
-	if(!ResourceManager()->IsResourceSound(Sound))
+	if(!ResourceManager()->FindResource(Sound))
 		return;
 
 	// create a sound
@@ -557,6 +557,7 @@ void CGameContext::OnTick()
 		{
 			m_apPlayers[i]->Tick();
 			m_apPlayers[i]->PostTick();
+			m_ResourceManager.TrySendResourceInfo(i);
 		}
 	}
 

src/game/server/resource.cpp

@@ -11,6 +11,16 @@ IServer *CServerResManager::Server() { return m_pGameContext->Server(); }
 IStorage *CServerResManager::Storage() { return m_pGameContext->Storage(); }
 CConfig *CServerResManager::Config() { return m_pGameContext->Config(); }
 
+CServerResManager::CServerResource *CServerResManager::FindResource(Uuid ResourceID)
+{
+	for(int i = 0; i < m_lResources.size(); i++)
+    {
+        if(m_lResources[i].m_Uuid == ResourceID)
+            return &m_lResources[i];
+    }
+    return nullptr;
+}
+
 CServerResManager::CServerResManager()
 {
 }
@@ -28,14 +38,10 @@ void CServerResManager::Init(CGameContext *pGameContext)
 
 void CServerResManager::SendResourceData(int ClientID, const Uuid RequestUuid)
 {
-	CServerResource Res;
-	Res.m_Uuid = RequestUuid;
-	sorted_array<CServerResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return;
-
     int ChunkSize = CResource::CHUNK_SIZE;
-    CServerResource *pTarget = &r.front();
+    CServerResource *pTarget = FindResource(RequestUuid);
+    if(!pTarget)
+        return;
 
     // send resource chunks, copied from map download
     for(int i = 0; i < Config()->m_SvResDownloadSpeed && pTarget->m_aDownloadChunks[ClientID] >= 0; ++i)
@@ -105,20 +111,7 @@ void CServerResManager::OnClientEnter(int ClientID)
 {
 	if(Server()->GetClientVersion(ClientID) < 0x0706)
 		return;
-	for(int i = 0; i < m_lResources.size(); i++)
-	{
-		CNetMsg_Sv_CustomResource Resource;
-		Resource.m_Uuid = &m_lResources[i].m_Uuid;
-		Resource.m_Type = m_lResources[i].m_Type;
-		Resource.m_Name = m_lResources[i].m_aName;
-		Resource.m_Crc = m_lResources[i].m_Crc;
-		Resource.m_Sha256 = &m_lResources[i].m_Sha256;
-		Resource.m_Size = m_lResources[i].m_DataSize;
-        Resource.m_ChunkPerRequest = m_ChunksPerRequest;
-		Server()->SendPackMsg(&Resource, MSGFLAG_VITAL | MSGFLAG_FLUSH | MSGFLAG_NORECORD, ClientID);
-
-		m_lResources[i].m_aDownloadChunks[ClientID] = 0;
-	}
+    m_aResourceSendIndex[ClientID] = 0;
 }
 
 void CServerResManager::Clear()
@@ -129,24 +122,30 @@ void CServerResManager::Clear()
             mem_free(m_lResources[i].m_pData);
         m_lResources[i].m_pData = 0;
     }
+    for(int i = 0; i < MAX_CLIENTS; i++)
+    {
+        m_aResourceSendIndex[i] = -1;
+    }
 }
 
-bool CServerResManager::IsResourceSound(Uuid ResID)
+void CServerResManager::TrySendResourceInfo(int ClientID)
 {
-	CServerResource Res;
-	Res.m_Uuid = ResID;
-	sorted_array<CServerResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return false;
-	return r.front().m_Type == RESOURCE_SOUND;
-}
+    if(!GameServer()->m_apPlayers[ClientID])
+        return;
 
-bool CServerResManager::IsResourceImage(Uuid ResID)
-{
-	CServerResource Res;
-	Res.m_Uuid = ResID;
-	sorted_array<CServerResource>::range r = ::find_binary(m_lResources.all(), Res);
-	if(r.empty() || r.size() > 1) // there couldn't be uuid collision, if that happened, then the server-side resource name must be wrong.
-		return false;
-	return r.front().m_Type == RESOURCE_IMAGE;
+    int Index = m_aResourceSendIndex[ClientID];
+    if(Index < 0 || Index >= m_lResources.size())
+        return;
+    CNetMsg_Sv_CustomResource Resource;
+    Resource.m_Uuid = &m_lResources[Index].m_Uuid;
+    Resource.m_Type = m_lResources[Index].m_Type;
+    Resource.m_Name = m_lResources[Index].m_aName;
+    Resource.m_Crc = m_lResources[Index].m_Crc;
+    Resource.m_Sha256 = &m_lResources[Index].m_Sha256;
+    Resource.m_Size = m_lResources[Index].m_DataSize;
+    Resource.m_ChunkPerRequest = m_ChunksPerRequest;
+    Server()->SendPackMsg(&Resource, MSGFLAG_VITAL | MSGFLAG_FLUSH | MSGFLAG_NORECORD, ClientID);
+
+    m_lResources[Index].m_aDownloadChunks[ClientID] = 0;
+    m_aResourceSendIndex[ClientID]++;
 }

src/game/server/resource.h

@@ -1,7 +1,7 @@
 #ifndef GAME_SERVER_RESOURCE_H
 #define GAME_SERVER_RESOURCE_H
 
-#include <base/tl/sorted_array.h>
+#include <base/tl/array.h>
 #include <game/resource.h>
 
 class CServerResManager
@@ -18,8 +18,10 @@ class CServerResManager
         int m_aDownloadChunks[MAX_CLIENTS];
     };
 
-    sorted_array<CServerResource> m_lResources;
+    int m_aResourceSendIndex[MAX_CLIENTS];
+    array<CServerResource> m_lResources;
     int m_ChunksPerRequest;
+
 public:
     CServerResManager();
     ~CServerResManager();
@@ -29,9 +31,8 @@ class CServerResManager
     void SendResourceData(int ClientID, const Uuid RequestUuid);
     void OnClientEnter(int ClientID);
     void Clear();
-
-    bool IsResourceSound(Uuid ResID);
-    bool IsResourceImage(Uuid ResID);
+	void TrySendResourceInfo(int ClientID);
+    CServerResource *FindResource(Uuid ResourceID);
 };
 
 #endif // GAME_SERVER_RESOURCE_H