Merge branch 'master' into jgrpp
# Conflicts: # src/lang/simplified_chinese.txt # src/network/core/tcp_content.cpp # src/network/core/udp.cpp # src/network/network_server.cpp # src/saveload/linkgraph_sl.cpp # src/table/gameopt_settings.ini
This commit is contained in:
@@ -992,7 +992,7 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
|
||||
uint16 rport = NETWORK_DEFAULT_PORT;
|
||||
CompanyID join_as = COMPANY_NEW_COMPANY;
|
||||
|
||||
ParseConnectionString(&company, &port, ip);
|
||||
ParseGameConnectionString(&company, &port, ip);
|
||||
|
||||
IConsolePrintF(CC_DEFAULT, "Connecting to %s...", ip);
|
||||
if (company != nullptr) {
|
||||
|
Reference in New Issue
Block a user