mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-29 19:00:07 +02:00
Code Issues Projects Releases Wiki Activity

- forgot to default ftp code to a default value (off) until ready

Browse Source
This commit is contained in:
Mark Vejvoda
2010-12-29 06:03:07 +00:00
parent e79147796f
commit 9afcbe97b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,7 +370,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
findDirs(config.getPathListForType(ptTilesets), tileSets); findDirs(config.getPathListForType(ptTilesets), tileSets);
if(config.getBool("EnableFTPXfer") == true) { if(config.getBool("EnableFTPXfer","false") == true) {
ClientInterface *clientInterface = networkManager.getClientInterface(); ClientInterface *clientInterface = networkManager.getClientInterface();
string serverUrl = clientInterface->getServerIpAddress() + ":61358"; string serverUrl = clientInterface->getServerIpAddress() + ":61358";

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

@@ -86,7 +86,7 @@ ServerInterface::ServerInterface() {
//serverSocket.bind(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str())); //serverSocket.bind(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
serverSocket.setBindPort(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str())); serverSocket.setBindPort(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
if(Config::getInstance().getBool("EnableFTPXfer") == true) { if(Config::getInstance().getBool("EnableFTPXfer","false") == true) {
std::pair<string,string> mapsPath; std::pair<string,string> mapsPath;
vector<string> pathList = Config::getInstance().getPathListForType(ptMaps); vector<string> pathList = Config::getInstance().getPathListForType(ptMaps);
if(pathList.size() > 0) { if(pathList.size() > 0) {