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

- ftp file xfer bugfixes

This commit is contained in:
Mark Vejvoda 2010-12-29 06:11:06 +00:00
parent 9afcbe97b8
commit b84bede3df
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -55,6 +55,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
currentTechName_factionPreview="";
currentFactionName_factionPreview="";
ftpClientThread = NULL;
getMissingMapFromFTPServer = "";
currentFactionLogo = "";
factionTexture=NULL;
@ -963,7 +964,8 @@ void MenuStateConnectedGame::update() {
}
else {
// try to get the map via ftp
if(ftpClientThread != NULL) {
if(ftpClientThread != NULL && getMissingMapFromFTPServer != currentMap) {
getMissingMapFromFTPServer = currentMap;
ftpClientThread->addMapToRequests(currentMap);
}
maps.push_back("***missing***");

1
source/glest_game/menu/menu_state_connected_game.h
View File

@ -137,6 +137,7 @@ private:
std::vector<std::string> tileSets;
FTPClientThread *ftpClientThread;
string getMissingMapFromFTPServer;
public:

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

@ -87,7 +87,7 @@ void FTPClientThread::getMapFromServer(string mapFileName) {
*/
char szBuf[1024]="";
sprintf(szBuf,"ftp://maps:mg_ftp_server@%s/maps/%s",serverUrl.c_str(),mapFileName.c_str());
sprintf(szBuf,"ftp://maps:mg_ftp_server@%s/%s",serverUrl.c_str(),mapFileName.c_str());
curl_easy_setopt(curl, CURLOPT_URL,szBuf);
/* Define our callback to get called when there's data to be written */
@ -107,7 +107,7 @@ void FTPClientThread::getMapFromServer(string mapFileName) {
/* we failed */
fprintf(stderr, "curl told us %d\n", res);
sprintf(szBuf,"ftp://maps_custom:mg_ftp_server@%s/maps/%s",serverUrl.c_str(),mapFileName.c_str());
sprintf(szBuf,"ftp://maps_custom:mg_ftp_server@%s/%s",serverUrl.c_str(),mapFileName.c_str());
curl_easy_setopt(curl, CURLOPT_URL,szBuf);
/* Define our callback to get called when there's data to be written */