forked from Tr0n/client
Merge new archive manager with zip file support
This commit is contained in:
@ -42,18 +42,17 @@ void CResource::Load()
|
||||
|
||||
const char * c_szFileName = GetFileName();
|
||||
|
||||
DWORD dwStart = ELTimer_GetMSec();
|
||||
CMappedFile file;
|
||||
LPCVOID fileData;
|
||||
DWORD dwStart = ELTimer_GetMSec();
|
||||
CEterPackManager::TPackDataPtr fileData;
|
||||
|
||||
//Tracenf("Load %s", c_szFileName);
|
||||
|
||||
if (CEterPackManager::Instance().Get(file, c_szFileName, &fileData))
|
||||
if (CEterPackManager::Instance().Get(c_szFileName, fileData))
|
||||
{
|
||||
m_dwLoadCostMiliiSecond = ELTimer_GetMSec() - dwStart;
|
||||
//Tracef("CResource::Load %s (%d bytes) in %d ms\n", c_szFileName, file.Size(), m_dwLoadCostMiliiSecond);
|
||||
|
||||
if (OnLoad(file.Size(), fileData))
|
||||
if (OnLoad(fileData->size(), fileData->data()))
|
||||
{
|
||||
me_state = STATE_EXIST;
|
||||
}
|
||||
@ -81,12 +80,11 @@ void CResource::Reload()
|
||||
Clear();
|
||||
Tracef("CResource::Reload %s\n", GetFileName());
|
||||
|
||||
CMappedFile file;
|
||||
LPCVOID fileData;
|
||||
CEterPackManager::TPackDataPtr fileData;
|
||||
|
||||
if (CEterPackManager::Instance().Get(file, GetFileName(), &fileData))
|
||||
if (CEterPackManager::Instance().Get(GetFileName(), fileData))
|
||||
{
|
||||
if (OnLoad(file.Size(), fileData))
|
||||
if (OnLoad(fileData->size(), fileData->data()))
|
||||
{
|
||||
me_state = STATE_EXIST;
|
||||
}
|
||||
|
Reference in New Issue
Block a user