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

warning of non default port usage is outdated and by this removed

This commit is contained in:
Titus Tscharntke 2012-10-06 14:56:40 +00:00
parent 9a57dc095f
commit b7e3964782
3 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -2478,15 +2478,7 @@ void MenuStateCustomGame::update() {
labelNetStatus[i].setText(szBuf);
}
else {
string port = intToStr(config.getInt("PortServer"));
if(port != intToStr(GameConstants::serverPort)){
port = port + " " + lang.get("NonStandardPort") + "!)";
}
else
{
port = port + ")";
}
port = "(" + port;
string port = "("+intToStr(config.getInt("PortServer"))+")";
labelNetStatus[i].setText("--- " + port);
}
}

33
source/glest_game/menu/menu_state_join_game.cpp
View File

@ -155,13 +155,7 @@ void MenuStateJoinGame::CommonInit(bool connect, Ip serverIp,int portNumberOverr
portNumber = strToInt(hostPartsList[1]);
}
string port = intToStr(portNumber);
if(port != intToStr(config.getInt("PortServer",intToStr(GameConstants::serverPort).c_str()))) {
port = port + " (" + lang.get("NonStandardPort") + ")";
}
else {
port = port + " (" + lang.get("StandardPort") + ")";
}
string port = " ("+intToStr(portNumber)+")";
labelServerPort.setText(port);
labelStatus.registerGraphicComponent(containerName,"labelStatus");
@ -205,13 +199,7 @@ void MenuStateJoinGame::CommonInit(bool connect, Ip serverIp,int portNumberOverr
portNumber = strToInt(hostPartsList[1]);
}
port = intToStr(portNumber);
if(port != intToStr(config.getInt("PortServer",intToStr(GameConstants::serverPort).c_str()))) {
port = port + " (" + lang.get("NonStandardPort") + ")";
}
else {
port = port + " (" + lang.get("StandardPort") + ")";
}
port = " ("+intToStr(portNumber)+")";
labelServerPort.setText(port);
GraphicComponent::applyAllCustomProperties(containerName);
@ -251,13 +239,7 @@ void MenuStateJoinGame::reloadUI() {
portNumber = strToInt(hostPartsList[1]);
}
string port = intToStr(portNumber);
if(port != intToStr(config.getInt("PortServer",intToStr(GameConstants::serverPort).c_str()))) {
port = port + " (" + lang.get("NonStandardPort") + ")";
}
else {
port = port + " (" + lang.get("StandardPort") + ")";
}
string port = " ("+intToStr(portNumber)+")";
labelServerPort.setText(port);
chatManager.init(&console, -1);
@ -360,14 +342,7 @@ void MenuStateJoinGame::mouseClick(int x, int y, MouseButton mouseButton) {
portNumber = strToInt(hostPartsList[1]);
}
Lang &lang= Lang::getInstance();
string port = intToStr(portNumber);
if(port != intToStr(config.getInt("PortServer",intToStr(GameConstants::serverPort).c_str()))) {
port = port + " (" + lang.get("NonStandardPort") + ")";
}
else {
port = port + " (" + lang.get("StandardPort") + ")";
}
string port = " ("+intToStr(portNumber)+")";
labelServerPort.setText(port);
}

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

@ -685,15 +685,6 @@ void MenuStateOptions::reloadUI() {
labelServerPortLabel.setText(lang.get("ServerPort"));
Config &config= Config::getInstance();
string port = intToStr(config.getInt("PortServer"));
if(port != intToStr(GameConstants::serverPort).c_str()) {
port = port +" ("+lang.get("NonStandardPort")+"!!)";
}
else{
port = port +" ("+lang.get("StandardPort")+")";
}
labelExternalPort.setText(port);
labelPublishServerExternalPort.setText(lang.get("PublishServerExternalPort"));