diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index 574f002e4e..72d18244f3 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -215,10 +215,8 @@ void TraversalClient::OnFailure(FailureReason reason) switch (reason) { case TraversalClient::BadHost: - { PanicAlertT("Couldn't look up central server %s", m_Server.c_str()); break; - } case TraversalClient::VersionTooOld: PanicAlertT("Dolphin too old for traversal server"); break; @@ -353,4 +351,4 @@ void ReleaseTraversalClient() g_TraversalClient.release(); g_MainNetHost.release(); -} \ No newline at end of file +} diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h index 7dbc92286e..7418aa8d25 100644 --- a/Source/Core/Common/TraversalClient.h +++ b/Source/Core/Common/TraversalClient.h @@ -34,7 +34,6 @@ public: ServerForgotAboutUs, SocketSendError, ResendTimeout, - ConnectFailedError = 0x400, }; TraversalClient(ENetHost* netHost, const std::string& server, const u16 port); ~TraversalClient(); diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 3c38fac05c..6fcbd6c70f 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -744,20 +744,19 @@ void NetPlayClient::OnConnectFailed(u8 reason) { m_connecting = false; m_state = Failure; - int swtch = TraversalClient::ConnectFailedError + reason; - switch (swtch) + switch (reason) { - case TraversalClient::ConnectFailedError + TraversalConnectFailedClientDidntRespond: + case TraversalConnectFailedClientDidntRespond: PanicAlertT("Traversal server timed out connecting to the host"); break; - case TraversalClient::ConnectFailedError + TraversalConnectFailedClientFailure: + case TraversalConnectFailedClientFailure: PanicAlertT("Server rejected traversal attempt"); break; - case TraversalClient::ConnectFailedError + TraversalConnectFailedNoSuchClient: + case TraversalConnectFailedNoSuchClient: PanicAlertT("Invalid host"); break; default: - PanicAlertT("Unknown error %x", swtch); + PanicAlertT("Unknown error %x", reason); break; } }