Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disable rescursive ftp file download for techtrees and tilesets

Browse Source
This commit is contained in:
Mark Vejvoda 2013-11-14 22:57:56 +00:00
parent 429db5ff66
commit e3245eb7f4
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/shared_lib/sources/platform/posix/miniftpclient.cpp
View File

@ -475,20 +475,26 @@ void FTPClientThread::getTilesetFromServer(pair<string,string> tileSetName) {
this->fileArchiveExtractCommandSuccessResult); this->fileArchiveExtractCommandSuccessResult);
pair<FTP_Client_ResultType,string> result = make_pair(ftp_crt_FAIL,""); pair<FTP_Client_ResultType,string> result = make_pair(ftp_crt_FAIL,"");
if(tileSetName.second != "") { if(findArchive == true) {
result = getTilesetFromServer(tileSetName, "", "", "", findArchive); if(tileSetName.second != "") {
} //result = getTilesetFromServer(tileSetName, "", "", "", findArchive);
else { result = getTilesetFromServer(tileSetName, "", "", "", true);
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, findArchive); }
if(result.first == ftp_crt_FAIL && this->getQuitStatus() == false) { else {
if(findArchive == true) { //result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, findArchive);
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, false); result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, true);
}
if(result.first == ftp_crt_FAIL && this->getQuitStatus() == false) { if(result.first == ftp_crt_FAIL && this->getQuitStatus() == false) {
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, findArchive); //if(findArchive == true) {
//result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, false);
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, true);
//}
if(result.first == ftp_crt_FAIL && this->getQuitStatus() == false) {
// result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, findArchive);
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, true);
if(findArchive == true) { // if(findArchive == true) {
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, false); // result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, false);
// }
} }
} }
} }