summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-08-16 20:49:33 +0200
committerGitHub <noreply@github.com>2022-08-16 20:49:33 +0200
commit6f931d49c74017fb66bf285dd060bc455ae05c85 (patch)
tree8d0d47e28d1f35a2a97664a14dccb94e9a96fbb5 /src/yuzu_cmd/yuzu.cpp
parentMerge pull request #8104 from Docteh/them_icons (diff)
parentcore/socket_proxy: Final nits (diff)
downloadyuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.tar
yuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.tar.gz
yuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.tar.bz2
yuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.tar.lz
yuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.tar.xz
yuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.tar.zst
yuzu-6f931d49c74017fb66bf285dd060bc455ae05c85.zip
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r--src/yuzu_cmd/yuzu.cpp10
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) {
"You tried to use the same nickname as another user that is connected to the Room");
exit(1);
break;
- case Network::RoomMember::Error::MacCollision:
- LOG_ERROR(Network, "You tried to use the same MAC-Address as another user that is "
+ case Network::RoomMember::Error::IpCollision:
+ LOG_ERROR(Network, "You tried to use the same fake IP-Address as another user that is "
"connected to the Room");
exit(1);
break;
- case Network::RoomMember::Error::ConsoleIdCollision:
- LOG_ERROR(Network, "Your Console ID conflicted with someone else in the Room");
- exit(1);
- break;
case Network::RoomMember::Error::WrongPassword:
LOG_ERROR(Network, "Room replied with: Wrong password");
exit(1);
@@ -365,7 +361,7 @@ int main(int argc, char** argv) {
member->BindOnError(OnNetworkError);
LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port,
nickname);
- member->Join(nickname, "", address.c_str(), port, 0, Network::NoPreferredMac, password);
+ member->Join(nickname, address.c_str(), port, 0, Network::NoPreferredIP, password);
} else {
LOG_ERROR(Network, "Could not access RoomMember");
return 0;