mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-05 23:09:04 +00:00
Fixed: #1455 VS10 isn't implicitly casting to CSString. Forcing it, which is probably more correct anyway.
This commit is contained in:
parent
548740bafc
commit
3178cb6708
6 changed files with 13 additions and 6 deletions
|
@ -257,7 +257,7 @@ IF(WIN32)
|
|||
IF(WITH_TOOLS)
|
||||
SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE)
|
||||
ENDIF(WITH_TOOLS)
|
||||
INCLUDE(InstallRequiredSystemLibraries)
|
||||
#INCLUDE(InstallRequiredSystemLibraries)
|
||||
ENDIF(WIN32)
|
||||
|
||||
INCLUDE(CPack)
|
||||
|
|
|
@ -472,7 +472,9 @@ bool CRyzomFileRetrieverImplementation::downloadBackupFiles(const CSString& shar
|
|||
continue;
|
||||
|
||||
// generate a local filename for the downloaded file
|
||||
CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName.replace("/","_")).replace(".","_");
|
||||
CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName);
|
||||
localFileName = localFileName.replace("/","_");
|
||||
localFileName = localFileName.replace(".","_");
|
||||
nlinfo("Requesting file download: REMOTE:%s => LOCAL:%s",fdc[i].FileName.c_str(),localFileName.c_str());
|
||||
|
||||
// put in a request for the file to be retrieved
|
||||
|
|
|
@ -134,7 +134,8 @@ bool CPatchmanAdminModule::initModule(const TParsedCommandLine &initInfo)
|
|||
CDeploymentConfigurationSynchroniser::init(this);
|
||||
|
||||
// now that the base classes have been initialised, we can cumulate the module manifests
|
||||
_Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip();
|
||||
_Manifest= (CFileReceiver::getModuleManifest()+_Manifest);
|
||||
_Manifest = _Manifest.strip();
|
||||
|
||||
// we're all done so let the world know
|
||||
registerProgress(string("PAM Initialised: ")+logMsg+" "+_Manifest);
|
||||
|
|
|
@ -385,7 +385,8 @@ bool CServerPatchApplier::initModule(const TParsedCommandLine &initInfo)
|
|||
CDeploymentConfigurationSynchroniser::init(this);
|
||||
|
||||
// now that the base classes have been initialised, we can cumulate the module manifests
|
||||
_Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip();
|
||||
_Manifest= (CFileReceiver::getModuleManifest()+_Manifest);
|
||||
_Manifest = _Manifest.strip();
|
||||
|
||||
// we're all done so let the world know
|
||||
registerProgress(string("SPA Initialised: ")+logMsg+" "+_Manifest);
|
||||
|
|
|
@ -136,7 +136,8 @@ bool CServerPatchBridge::initModule(const TParsedCommandLine &initInfo)
|
|||
CFileReceiver::init(this,"*/*");
|
||||
|
||||
// now that the base classes have been initialised, we can cumulate the module manifests
|
||||
_Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest).strip();
|
||||
_Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest);
|
||||
_Manifest = _Manifest.strip();
|
||||
|
||||
// scan our local file cache to buildup our starting file base
|
||||
setStateVariable("State","Scanning");
|
||||
|
|
|
@ -81,7 +81,9 @@ static void addSPTMessage(const CSString& moduleName, const CSString& msgText)
|
|||
nldebug("SPTMSG_VERBOSE %d: %s: %s",count,moduleName.c_str(),msgText.c_str());
|
||||
|
||||
// look for a slot to stick the message in
|
||||
CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':')).strip();
|
||||
CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':'));
|
||||
cleanModuleName = cleanModuleName.strip();
|
||||
|
||||
uint32 oldest=0;
|
||||
uint32 oldestTime=~0u;
|
||||
for (uint32 i=0;i<sizeof(SPTMessage)/sizeof(SPTMessage[0]) && i<NumSPTWatches.get();++i)
|
||||
|
|
Loading…
Reference in a new issue