Fix build

feature/streamed-package
kaetemi 5 years ago committed by Jan Boon
parent 3fe0ad30a3
commit cf2d5e939f

@ -48,6 +48,7 @@
#include "nel/misc/big_file.h" #include "nel/misc/big_file.h"
#include "nel/misc/i18n.h" #include "nel/misc/i18n.h"
#include "nel/misc/cmd_args.h" #include "nel/misc/cmd_args.h"
#include "nel/misc/seven_zip.h"
#include "game_share/bg_downloader_msg.h" #include "game_share/bg_downloader_msg.h"
@ -55,7 +56,6 @@
#include "login.h" #include "login.h"
#include "user_agent.h" #include "user_agent.h"
#include "seven_zip/seven_zip.h"
#ifndef RY_BG_DOWNLOADER #ifndef RY_BG_DOWNLOADER
#include "client_cfg.h" #include "client_cfg.h"

@ -74,7 +74,7 @@ bool CBNPFileVersion::setup(const std::string &fileName, uint32 versionNumber)
BOMB_IF(!NLMISC::CFile::fileExists(fileName),("File not found: "+fileName).c_str(),return false); BOMB_IF(!NLMISC::CFile::fileExists(fileName),("File not found: "+fileName).c_str(),return false);
// generate a hash key for the file and store it in a vector of uint32 // generate a hash key for the file and store it in a vector of uint32
CHashKey hashKey= getSHA1(fileName); NLMISC::CHashKey hashKey= NLMISC::getSHA1(fileName);
nlassert(hashKey.HashKeyString.size()==20); nlassert(hashKey.HashKeyString.size()==20);
_HashKey.clear(); _HashKey.clear();
for (uint32 i=0;i<5;++i) for (uint32 i=0;i<5;++i)
@ -137,10 +137,10 @@ uint32 CBNPFileVersion::getPatchSize() const
return _PatchSize; return _PatchSize;
} }
CHashKey CBNPFileVersion::getHashKey() const NLMISC::CHashKey CBNPFileVersion::getHashKey() const
{ {
nlassert(_HashKey.size()==5); nlassert(_HashKey.size()==5);
CHashKey hashKey; NLMISC::CHashKey hashKey;
for (uint32 i=0;i<5;++i) for (uint32 i=0;i<5;++i)
{ {
*(uint32*)&hashKey.HashKeyString[4*i]=_HashKey[i]; *(uint32*)&hashKey.HashKeyString[4*i]=_HashKey[i];

@ -72,7 +72,7 @@ public:
uint32 get7ZFileSize() const; uint32 get7ZFileSize() const;
uint32 getFileSize() const; uint32 getFileSize() const;
uint32 getPatchSize() const; uint32 getPatchSize() const;
CHashKey getHashKey() const; NLMISC::CHashKey getHashKey() const;
// == operator // == operator
bool operator==(const CBNPFileVersion& other) const; bool operator==(const CBNPFileVersion& other) const;

Loading…
Cancel
Save