diff options
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 003890c07..3a0f33cba 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -108,15 +108,11 @@ static void OnNetworkError(const Network::RoomMember::Error& error) { | |||
| 108 | "You tried to use the same nickname as another user that is connected to the Room"); | 108 | "You tried to use the same nickname as another user that is connected to the Room"); |
| 109 | exit(1); | 109 | exit(1); |
| 110 | break; | 110 | break; |
| 111 | case Network::RoomMember::Error::MacCollision: | 111 | case Network::RoomMember::Error::IpCollision: |
| 112 | LOG_ERROR(Network, "You tried to use the same MAC-Address as another user that is " | 112 | LOG_ERROR(Network, "You tried to use the same fake IP-Address as another user that is " |
| 113 | "connected to the Room"); | 113 | "connected to the Room"); |
| 114 | exit(1); | 114 | exit(1); |
| 115 | break; | 115 | break; |
| 116 | case Network::RoomMember::Error::ConsoleIdCollision: | ||
| 117 | LOG_ERROR(Network, "Your Console ID conflicted with someone else in the Room"); | ||
| 118 | exit(1); | ||
| 119 | break; | ||
| 120 | case Network::RoomMember::Error::WrongPassword: | 116 | case Network::RoomMember::Error::WrongPassword: |
| 121 | LOG_ERROR(Network, "Room replied with: Wrong password"); | 117 | LOG_ERROR(Network, "Room replied with: Wrong password"); |
| 122 | exit(1); | 118 | exit(1); |
| @@ -365,7 +361,7 @@ int main(int argc, char** argv) { | |||
| 365 | member->BindOnError(OnNetworkError); | 361 | member->BindOnError(OnNetworkError); |
| 366 | LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port, | 362 | LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port, |
| 367 | nickname); | 363 | nickname); |
| 368 | member->Join(nickname, "", address.c_str(), port, 0, Network::NoPreferredMac, password); | 364 | member->Join(nickname, address.c_str(), port, 0, Network::NoPreferredIP, password); |
| 369 | } else { | 365 | } else { |
| 370 | LOG_ERROR(Network, "Could not access RoomMember"); | 366 | LOG_ERROR(Network, "Could not access RoomMember"); |
| 371 | return 0; | 367 | return 0; |