warning of non default port usage is outdated and by this removed
This commit is contained in:
parent
9a57dc095f
commit
b7e3964782
|
@ -2478,15 +2478,7 @@ void MenuStateCustomGame::update() {
|
||||||
labelNetStatus[i].setText(szBuf);
|
labelNetStatus[i].setText(szBuf);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
string port = intToStr(config.getInt("PortServer"));
|
string port = "("+intToStr(config.getInt("PortServer"))+")";
|
||||||
if(port != intToStr(GameConstants::serverPort)){
|
|
||||||
port = port + " " + lang.get("NonStandardPort") + "!)";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
port = port + ")";
|
|
||||||
}
|
|
||||||
port = "(" + port;
|
|
||||||
labelNetStatus[i].setText("--- " + port);
|
labelNetStatus[i].setText("--- " + port);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,13 +155,7 @@ void MenuStateJoinGame::CommonInit(bool connect, Ip serverIp,int portNumberOverr
|
||||||
portNumber = strToInt(hostPartsList[1]);
|
portNumber = strToInt(hostPartsList[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
string port = intToStr(portNumber);
|
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") + ")";
|
|
||||||
}
|
|
||||||
labelServerPort.setText(port);
|
labelServerPort.setText(port);
|
||||||
|
|
||||||
labelStatus.registerGraphicComponent(containerName,"labelStatus");
|
labelStatus.registerGraphicComponent(containerName,"labelStatus");
|
||||||
|
@ -205,13 +199,7 @@ void MenuStateJoinGame::CommonInit(bool connect, Ip serverIp,int portNumberOverr
|
||||||
portNumber = strToInt(hostPartsList[1]);
|
portNumber = strToInt(hostPartsList[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
port = intToStr(portNumber);
|
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") + ")";
|
|
||||||
}
|
|
||||||
labelServerPort.setText(port);
|
labelServerPort.setText(port);
|
||||||
|
|
||||||
GraphicComponent::applyAllCustomProperties(containerName);
|
GraphicComponent::applyAllCustomProperties(containerName);
|
||||||
|
@ -251,13 +239,7 @@ void MenuStateJoinGame::reloadUI() {
|
||||||
portNumber = strToInt(hostPartsList[1]);
|
portNumber = strToInt(hostPartsList[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
string port = intToStr(portNumber);
|
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") + ")";
|
|
||||||
}
|
|
||||||
labelServerPort.setText(port);
|
labelServerPort.setText(port);
|
||||||
|
|
||||||
chatManager.init(&console, -1);
|
chatManager.init(&console, -1);
|
||||||
|
@ -360,14 +342,7 @@ void MenuStateJoinGame::mouseClick(int x, int y, MouseButton mouseButton) {
|
||||||
portNumber = strToInt(hostPartsList[1]);
|
portNumber = strToInt(hostPartsList[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Lang &lang= Lang::getInstance();
|
string port = " ("+intToStr(portNumber)+")";
|
||||||
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") + ")";
|
|
||||||
}
|
|
||||||
labelServerPort.setText(port);
|
labelServerPort.setText(port);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -685,15 +685,6 @@ void MenuStateOptions::reloadUI() {
|
||||||
|
|
||||||
labelServerPortLabel.setText(lang.get("ServerPort"));
|
labelServerPortLabel.setText(lang.get("ServerPort"));
|
||||||
Config &config= Config::getInstance();
|
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"));
|
labelPublishServerExternalPort.setText(lang.get("PublishServerExternalPort"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user