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

- set FTP file transfers to be enabled by default

Browse Source
This commit is contained in:
Mark Vejvoda 2011-01-06 07:17:02 +00:00
parent 9698e6cc95
commit 2956d2c782
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
findDirs(config.getPathListForType(ptTilesets), tileSets);
if(config.getBool("EnableFTPXfer","false") == true) {
if(config.getBool("EnableFTPXfer","true") == true) {
ClientInterface *clientInterface = networkManager.getClientInterface();
string serverUrl = clientInterface->getServerIpAddress();
int portNumber = config.getInt("FTPServerPort",intToStr(ServerSocket::getFTPServerPort()).c_str());

2
source/glest_game/menu/menu_state_options.cpp
View File

@ -179,7 +179,7 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
checkBoxMapEnableFTP.registerGraphicComponent(containerName,"checkBoxMapEnableFTP");
checkBoxMapEnableFTP.init(leftLabelStart + 450,leftline);
checkBoxMapEnableFTP.setValue(config.getBool("EnableFTPXfer"));
checkBoxMapEnableFTP.setValue(config.getBool("EnableFTPXfer","true"));
labelFTPServerPortLabel.registerGraphicComponent(containerName,"labelFTPServerPortLabel");
labelFTPServerPortLabel.init(leftLabelStart + 330,leftline - 30);

2
source/glest_game/network/server_interface.cpp
View File

@ -90,7 +90,7 @@ ServerInterface::ServerInterface() : GameNetworkInterface() {
serverSocket.setBindPort(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(Config::getInstance().getBool("EnableFTPXfer","false") == true) {
if(Config::getInstance().getBool("EnableFTPXfer","true") == true) {
std::pair<string,string> mapsPath;
vector<string> pathList = Config::getInstance().getPathListForType(ptMaps);
if(pathList.size() > 0) {