Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make ms port selection actually work??

Browse Source
This commit is contained in:
scatterflower 2021-03-11 13:32:20 -06:00
parent 8c39d6ee35
commit b515407967
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config_manager.h
View File

@ -36,7 +36,7 @@ class ConfigManager {
QString ms_ip; QString ms_ip;
int port; int port;
int ws_port; int ws_port;
int local_port; int ms_port;
QString name; QString name;
QString description; QString description;
bool advertise_server; bool advertise_server;

4
src/config_manager.cpp
View File

@ -139,8 +139,8 @@ bool ConfigManager::loadServerSettings(server_settings* settings)
config.value("port", "27016").toInt(&port_conversion_success); config.value("port", "27016").toInt(&port_conversion_success);
settings->ws_port = settings->ws_port =
config.value("webao_port", "27017").toInt(&ws_port_conversion_success); config.value("webao_port", "27017").toInt(&ws_port_conversion_success);
settings->local_port = settings->ms_port =
config.value("port", "27016").toInt(&local_port_conversion_success); config.value("ms_port", "27016").toInt(&local_port_conversion_success);
settings->name = config.value("server_name", "My First Server").toString(); settings->name = config.value("server_name", "My First Server").toString();
settings->description = settings->description =
config.value("server_description", "This is my flashy new server") config.value("server_description", "This is my flashy new server")

4
src/main.cpp
View File

@ -55,8 +55,8 @@ int main(int argc, char* argv[])
else { else {
if (settings.advertise_server) { if (settings.advertise_server) {
advertiser = advertiser =
new Advertiser(settings.ms_ip, settings.port, new Advertiser(settings.ms_ip, settings.ms_port,
settings.ws_port, settings.local_port, settings.ws_port, settings.port,
settings.name, settings.description); settings.name, settings.description);
advertiser->contactMasterServer(); advertiser->contactMasterServer();
} }