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

Merge pull request #450 from TES3MP/0.6.2

Browse source 
Add 0.6.2 commits up to 19 Jun 2018
This commit is contained in:
David Cernat 2018-06-19 05:26:38 +03:00 committed by GitHub
commit aa3639f2da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/Networking.cpp
View file

@ -321,7 +321,7 @@ void Networking::newPlayer(RakNet::RakNetGUID guid)
if (pl->first == guid) continue; if (pl->first == guid) continue;
// If an invalid key makes it into the Players map, ignore it // If an invalid key makes it into the Players map, ignore it
else if (pl->first == RakNet::UNASSIGNED_RAKNET_GUID) continue; else if (pl->first == RakNet::UNASSIGNED_CRABNET_GUID) continue;
// if player not fully connected // if player not fully connected
else if (pl->second == nullptr) continue; else if (pl->second == nullptr) continue;

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

@ -239,9 +239,9 @@ int main(int argc, char *argv[])
switch (peer->Startup((unsigned) players, &sd, 1)) switch (peer->Startup((unsigned) players, &sd, 1))
{ {
case RakNet::RAKNET_STARTED: case RakNet::CRABNET_STARTED:
break; break;
case RakNet::RAKNET_ALREADY_STARTED: case RakNet::CRABNET_ALREADY_STARTED:
throw runtime_error("Already started"); throw runtime_error("Already started");
case RakNet::INVALID_SOCKET_DESCRIPTORS: case RakNet::INVALID_SOCKET_DESCRIPTORS:
throw runtime_error("Incorrect port or address"); throw runtime_error("Incorrect port or address");

9
apps/openmw/mwmp/Networking.cpp
View file

@ -200,7 +200,7 @@ Networking::Networking(): peer(RakNet::RakPeerInterface::GetInstance()), playerP
RakNet::SocketDescriptor sd; RakNet::SocketDescriptor sd;
sd.port=0; sd.port=0;
auto b = peer->Startup(1, &sd, 1); auto b = peer->Startup(1, &sd, 1);
RakAssert(b==RakNet::RAKNET_STARTED); RakAssert(b==RakNet::CRABNET_STARTED);
playerPacketController.SetStream(0, &bsOut); playerPacketController.SetStream(0, &bsOut);
actorPacketController.SetStream(0, &bsOut); actorPacketController.SetStream(0, &bsOut);
@ -303,6 +303,13 @@ void Networking::connect(const std::string &ip, unsigned short port, std::vector
queue = false; queue = false;
break; break;
} }
case ID_INCOMPATIBLE_PROTOCOL_VERSION:
{
errmsg = "Network protocol mismatch!\nMake sure your client is really on the same version\n"
"as the server you are trying to connect to.";
queue = false;
break;
}
case ID_CONNECTION_REQUEST_ACCEPTED: case ID_CONNECTION_REQUEST_ACCEPTED:
{ {
serverAddr = packet->systemAddress; serverAddr = packet->systemAddress;