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

- added an option to disable FTP server but keep ftp client

Browse Source
This commit is contained in:
Mark Vejvoda
2011-01-07 05:32:47 +00:00
parent ec467b6ac4
commit 02b7787b35
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,31 +174,39 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
// FTP Config - start // FTP Config - start
labelEnableFTP.registerGraphicComponent(containerName,"labelEnableFTP"); labelEnableFTP.registerGraphicComponent(containerName,"labelEnableFTP");
labelEnableFTP.init(leftLabelStart + 330,leftline); labelEnableFTP.init(leftLabelStart + 330,leftline + 60);
labelEnableFTP.setText(lang.get("EnableFTP")); labelEnableFTP.setText(lang.get("EnableFTP"));
checkBoxMapEnableFTP.registerGraphicComponent(containerName,"checkBoxMapEnableFTP"); checkBoxEnableFTP.registerGraphicComponent(containerName,"checkBoxEnableFTP");
checkBoxMapEnableFTP.init(leftLabelStart + 450,leftline); checkBoxEnableFTP.init(leftLabelStart + 330,leftline + 30);
checkBoxMapEnableFTP.setValue(config.getBool("EnableFTPXfer","true")); checkBoxEnableFTP.setValue(config.getBool("EnableFTPXfer","true"));
labelEnableFTPServer.registerGraphicComponent(containerName,"labelEnableFTPServer");
labelEnableFTPServer.init(leftLabelStart + 330,leftline);
labelEnableFTPServer.setText(lang.get("EnableFTPServer"));
checkBoxEnableFTPServer.registerGraphicComponent(containerName,"checkBoxEnableFTPServer");
checkBoxEnableFTPServer.init(leftLabelStart + 330,leftline - 30);
checkBoxEnableFTPServer.setValue(config.getBool("EnableFTPServer","true"));
labelFTPServerPortLabel.registerGraphicComponent(containerName,"labelFTPServerPortLabel"); labelFTPServerPortLabel.registerGraphicComponent(containerName,"labelFTPServerPortLabel");
labelFTPServerPortLabel.init(leftLabelStart + 330,leftline - 30); labelFTPServerPortLabel.init(leftLabelStart + 330,leftline - 60);
labelFTPServerPortLabel.setText(lang.get("FTPServerPort")); labelFTPServerPortLabel.setText(lang.get("FTPServerPort"));
int FTPPort = config.getInt("FTPServerPort",intToStr(ServerSocket::getFTPServerPort()).c_str()); int FTPPort = config.getInt("FTPServerPort",intToStr(ServerSocket::getFTPServerPort()).c_str());
labelFTPServerPort.registerGraphicComponent(containerName,"labelFTPServerPort"); labelFTPServerPort.registerGraphicComponent(containerName,"labelFTPServerPort");
labelFTPServerPort.init(leftLabelStart + 330,leftline - 40); labelFTPServerPort.init(leftLabelStart + 330,leftline - 75);
labelFTPServerPort.setText(intToStr(FTPPort)); labelFTPServerPort.setText(intToStr(FTPPort));
labelFTPServerDataPortsLabel.registerGraphicComponent(containerName,"labelFTPServerDataPortsLabel"); labelFTPServerDataPortsLabel.registerGraphicComponent(containerName,"labelFTPServerDataPortsLabel");
labelFTPServerDataPortsLabel.init(leftLabelStart + 450,leftline - 30); labelFTPServerDataPortsLabel.init(leftLabelStart + 450,leftline - 60);
labelFTPServerDataPortsLabel.setText(lang.get("FTPServerDataPort")); labelFTPServerDataPortsLabel.setText(lang.get("FTPServerDataPort"));
char szBuf[1024]=""; char szBuf[1024]="";
sprintf(szBuf,"%d - %d",FTPPort + 1, FTPPort + GameConstants::maxPlayers); sprintf(szBuf,"%d - %d",FTPPort + 1, FTPPort + GameConstants::maxPlayers);
labelFTPServerDataPorts.registerGraphicComponent(containerName,"labelFTPServerDataPorts"); labelFTPServerDataPorts.registerGraphicComponent(containerName,"labelFTPServerDataPorts");
labelFTPServerDataPorts.init(leftLabelStart + 450,leftline - 40); labelFTPServerDataPorts.init(leftLabelStart + 450,leftline - 75);
labelFTPServerDataPorts.setText(szBuf); labelFTPServerDataPorts.setText(szBuf);
// FTP config end // FTP config end
@@ -478,7 +486,8 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
checkBoxFullscreenWindowed.mouseClick(x, y); checkBoxFullscreenWindowed.mouseClick(x, y);
listBoxPublishServerExternalPort.mouseClick(x, y); listBoxPublishServerExternalPort.mouseClick(x, y);
checkBoxMapEnableFTP.mouseClick(x, y); checkBoxEnableFTP.mouseClick(x, y);
checkBoxEnableFTPServer.mouseClick(x, y);
} }
} }
@@ -508,7 +517,8 @@ void MenuStateOptions::mouseMove(int x, int y, const MouseState *ms){
listFontSizeAdjustment.mouseMove(x, y); listFontSizeAdjustment.mouseMove(x, y);
listBoxPublishServerExternalPort.mouseMove(x, y); listBoxPublishServerExternalPort.mouseMove(x, y);
checkBoxMapEnableFTP.mouseMove(x, y); checkBoxEnableFTP.mouseMove(x, y);
checkBoxEnableFTPServer.mouseMove(x, y);
} }
void MenuStateOptions::keyDown(char key){ void MenuStateOptions::keyDown(char key){
@@ -606,7 +616,11 @@ void MenuStateOptions::render(){
renderer.renderListBox(&listBoxPublishServerExternalPort); renderer.renderListBox(&listBoxPublishServerExternalPort);
renderer.renderLabel(&labelEnableFTP); renderer.renderLabel(&labelEnableFTP);
renderer.renderCheckBox(&checkBoxMapEnableFTP); renderer.renderCheckBox(&checkBoxEnableFTP);
renderer.renderLabel(&labelEnableFTPServer);
renderer.renderCheckBox(&checkBoxEnableFTPServer);
renderer.renderLabel(&labelFTPServerPortLabel); renderer.renderLabel(&labelFTPServerPortLabel);
renderer.renderLabel(&labelFTPServerPort); renderer.renderLabel(&labelFTPServerPort);
renderer.renderLabel(&labelFTPServerDataPortsLabel); renderer.renderLabel(&labelFTPServerDataPortsLabel);
@@ -645,7 +659,8 @@ void MenuStateOptions::saveConfig(){
CoreData::getInstance().getMenuMusic()->setVolume(strToInt(listBoxVolumeMusic.getSelectedItem())/100.f); CoreData::getInstance().getMenuMusic()->setVolume(strToInt(listBoxVolumeMusic.getSelectedItem())/100.f);
config.setString("SoundVolumeMusic", listBoxVolumeMusic.getSelectedItem()); config.setString("SoundVolumeMusic", listBoxVolumeMusic.getSelectedItem());
config.setString("MasterServerExternalPort", listBoxPublishServerExternalPort.getSelectedItem()); config.setString("MasterServerExternalPort", listBoxPublishServerExternalPort.getSelectedItem());
config.setBool("EnableFTPXfer", checkBoxMapEnableFTP.getValue()); config.setBool("EnableFTPXfer", checkBoxEnableFTP.getValue());
config.setBool("EnableFTPServer", checkBoxEnableFTPServer.getValue());
string currentResolution=config.getString("ScreenWidth")+"x"+config.getString("ScreenHeight"); string currentResolution=config.getString("ScreenWidth")+"x"+config.getString("ScreenHeight");
string selectedResolution=listBoxScreenModes.getSelectedItem(); string selectedResolution=listBoxScreenModes.getSelectedItem();

5
source/glest_game/menu/menu_state_options.h
View File

@@ -82,7 +82,10 @@ private:
GraphicLabel labelEnableFTP; GraphicLabel labelEnableFTP;
GraphicCheckBox checkBoxMapEnableFTP; GraphicCheckBox checkBoxEnableFTP;
GraphicLabel labelEnableFTPServer;
GraphicCheckBox checkBoxEnableFTPServer;
GraphicLabel labelFTPServerPortLabel; GraphicLabel labelFTPServerPortLabel;
GraphicLabel labelFTPServerPort; GraphicLabel labelFTPServerPort;

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())); serverSocket.setBindPort(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(Config::getInstance().getBool("EnableFTPXfer","true") == true) { if(Config::getInstance().getBool("EnableFTPServer","true") == 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) {