ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix -Wswitch warning

This commit is contained in:
Tillmann Karras 2015-03-01 16:17:32 +01:00
parent b0bde31ac0
commit 88264f5712
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/TraversalClient.cpp
View File

@ -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();
}
}

1
Source/Core/Common/TraversalClient.h
View File

@ -34,7 +34,6 @@ public:
ServerForgotAboutUs,
SocketSendError,
ResendTimeout,
ConnectFailedError = 0x400,
};
TraversalClient(ENetHost* netHost, const std::string& server, const u16 port);
~TraversalClient();

11
Source/Core/Core/NetPlayClient.cpp
View File

@ -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;
}
}