Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Don't use SrcPath and DstPath anymore (ClientPatchPath and ClientRootPath are more explicit)

Browse source
This commit is contained in:
kervala 2016-02-21 13:15:29 +01:00
parent 591f69b2c0
commit ec6d43787a
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
code/ryzom/client/src/login_patch.cpp
View file

@ -739,18 +739,6 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
const CBNPCategorySet &rDescCats = descFile.getCategories(); const CBNPCategorySet &rDescCats = descFile.getCategories();
OptionalCat.clear(); OptionalCat.clear();
string SrcPath = ClientPatchPath;
string DstPath = ClientRootPath;
#ifdef NL_OS_WINDOWS
// only fix backslashes for .bat
string batchSrcPath = CPath::standardizeDosPath(SrcPath);
string batchDstPath = CPath::standardizeDosPath(DstPath);
#else
string batchSrcPath = SrcPath;
string batchDstPath = DstPath;
#endif
for (uint32 i = 0; i < rDescCats.categoryCount(); ++i) for (uint32 i = 0; i < rDescCats.categoryCount(); ++i)
{ {
// For all optional categories check if there is a 'file to patch' in it // For all optional categories check if there is a 'file to patch' in it
@ -759,14 +747,16 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
if (!rCat.getUnpackTo().empty()) if (!rCat.getUnpackTo().empty())
for (uint32 j = 0; j < rCat.fileCount(); ++j) for (uint32 j = 0; j < rCat.fileCount(); ++j)
{ {
string rFilename = SrcPath + rCat.getFile(j); string rFilename = ClientPatchPath + rCat.getFile(j);
nlwarning("\tFileName = %s", rFilename.c_str());
nlinfo("\tFileName = %s", rFilename.c_str());
// Extract to patch // Extract to patch
vector<string> vFilenames; vector<string> vFilenames;
bool result = false; bool result = false;
try try
{ {
result = bnpUnpack(rFilename, SrcPath, vFilenames); result = bnpUnpack(rFilename, ClientPatchPath, vFilenames);
} }
catch(...) catch(...)
{ {
@ -798,7 +788,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
CFile::deleteFile(fullDstPath + FileName); CFile::deleteFile(fullDstPath + FileName);
// try to move it, if fails move it later in a script // try to move it, if fails move it later in a script
if (CFile::moveFile(fullDstPath + FileName, SrcPath + FileName)) if (CFile::moveFile(fullDstPath + FileName, ClientPatchPath + FileName))
succeeded = true; succeeded = true;
} }
@ -807,9 +797,10 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
{ {
string batchRelativeDstPath; string batchRelativeDstPath;
if (fullDstPath.compare(0, DstPath.length(), DstPath) == 0) // should be always true
if (fullDstPath.compare(0, ClientRootPath.length(), ClientRootPath) == 0)
{ {
batchRelativeDstPath = fullDstPath.substr(DstPath.length()) + FileName; batchRelativeDstPath = fullDstPath.substr(ClientRootPath.length()) + FileName;
} }
else else
{ {