teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[General] Switch to new official master server port when using old one

Browse source
This commit is contained in:
David Cernat 2018-08-22 13:49:17 +03:00
parent 0658d39eaa
commit d1fa57ac14
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/browser/main.cpp
View file

@ -36,6 +36,11 @@ int main(int argc, char *argv[])
std::string addr = mgr.getString("address", "Master"); std::string addr = mgr.getString("address", "Master");
int port = mgr.getInt("port", "Master"); int port = mgr.getInt("port", "Master");
// Is this an attempt to connect to the official master server at the old port? If so,
// redirect it to the correct port for the currently used fork of RakNet
if (Misc::StringUtils::ciEqual(addr, "master.tes3mp.com") && port == 25560)
port = 25561;
// initialize resources, if needed // initialize resources, if needed
// Q_INIT_RESOURCE(resfile); // Q_INIT_RESOURCE(resfile);

8
apps/openmw-mp/main.cpp
View file

@ -292,6 +292,14 @@ int main(int argc, char *argv[])
int masterPort = mgr.getInt("port", "MasterServer"); int masterPort = mgr.getInt("port", "MasterServer");
int updateRate = mgr.getInt("rate", "MasterServer"); int updateRate = mgr.getInt("rate", "MasterServer");
// Is this an attempt to connect to the official master server at the old port? If so,
// redirect it to the correct port for the currently used fork of RakNet
if (Misc::StringUtils::ciEqual(masterAddr, "master.tes3mp.com") && masterPort == 25560)
{
LOG_APPEND(Log::LOG_INFO, "- switching to port 25561 because the correct official master server for this version is on that port");
masterPort = 25561;
}
networking.InitQuery(masterAddr, (unsigned short) masterPort); networking.InitQuery(masterAddr, (unsigned short) masterPort);
networking.getMasterClient()->SetMaxPlayers((unsigned) players); networking.getMasterClient()->SetMaxPlayers((unsigned) players);
networking.getMasterClient()->SetUpdateRate((unsigned) updateRate); networking.getMasterClient()->SetUpdateRate((unsigned) updateRate);