Merge pull request #450 from TES3MP/0.6.2

Add 0.6.2 commits up to 19 Jun 2018

apps/openmw-mp/Networking.cpp

@@ -321,7 +321,7 @@ void Networking::newPlayer(RakNet::RakNetGUID guid)
         if (pl->first == guid) continue;
 
         // 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
         else if (pl->second == nullptr) continue;

apps/openmw-mp/main.cpp

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

apps/openmw/mwmp/Networking.cpp

@@ -200,7 +200,7 @@ Networking::Networking(): peer(RakNet::RakPeerInterface::GetInstance()), playerP
     RakNet::SocketDescriptor sd;
     sd.port=0;
     auto b = peer->Startup(1, &sd, 1);
-    RakAssert(b==RakNet::RAKNET_STARTED);
+    RakAssert(b==RakNet::CRABNET_STARTED);
 
     playerPacketController.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;
                     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:
                 {
                     serverAddr = packet->systemAddress;