From e8ad19f267216ab76037b24bdcc1243367e96532 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 9 Dec 2016 19:11:09 +1100 Subject: [PATCH] Avoid crashes from duplicate usernames --- client/scenes/lobby_menu.cpp | 12 ++++++++++-- rsc/config.cfg | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/client/scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp index ac4d9ef..bbd06e5 100644 --- a/client/scenes/lobby_menu.cpp +++ b/client/scenes/lobby_menu.cpp @@ -347,11 +347,19 @@ void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) { } void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) { - //TODO: (9) LobbyMenu::HandleJoinRejection() + //NOTE: NEVER HAPPENS + throw(std::runtime_error("HandleJoinRejection")); } void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) { - //TODO: (9) LobbyMenu::HandleLoginRejection + config["client.disconnectMessage"] = std::string() + "Join request rejected: " + argPacket->text; + SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN); + + //avoid crashes from the heartbeat system + ClientPacket newPacket; + newPacket.type = SerialPacketType::DISCONNECT_REQUEST; + newPacket.clientIndex = clientIndex; + network.SendTo(argPacket->srcAddress, &newPacket); } //------------------------- diff --git a/rsc/config.cfg b/rsc/config.cfg index 1c2d90d..911f99a 100644 --- a/rsc/config.cfg +++ b/rsc/config.cfg @@ -15,6 +15,7 @@ server.dbname = database.db #client.screen.f = false #NOTE: fullscreen option is currently disabled client.username = username +client.password = password client.handle = handle client.avatar = character2.png