Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

changed player join/leave message

Browse Source
This commit is contained in:
Simon Pribylski
2023-08-14 18:34:07 +02:00
parent 8f2a22762a
commit 7ab8c79fdf
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/Lobby.cpp
View File

@@ -63,7 +63,6 @@ void Lobby::SendTimeRemaining() {
void Lobby::OnPlayerJoin(std::uint8_t playerID) { void Lobby::OnPlayerJoin(std::uint8_t playerID) {
m_Players.push_back(playerID); m_Players.push_back(playerID);
utils::LOG("(Server) Player Joined Lobby !");
if (!m_LobbyOpened) if (!m_LobbyOpened)
return; return;
@@ -83,7 +82,6 @@ void Lobby::OnPlayerLeave(std::uint8_t playerID)
m_Players.erase(it); m_Players.erase(it);
utils::LOG("(Server) Player Leaved Lobby !");
if (!m_LobbyOpened) if (!m_LobbyOpened)
return; return;

4
src/server/Server.cpp
View File

@@ -164,8 +164,10 @@ void Server::BroadcastPacket(const protocol::Packet* packet) {
void Server::RemoveConnexion(std::uint8_t connexionID) { void Server::RemoveConnexion(std::uint8_t connexionID) {
auto it = GetPlayers().find(connexionID); auto it = GetPlayers().find(connexionID);
if (it != GetPlayers().end()) if (it != GetPlayers().end()) {
GetPlayers().erase(it); GetPlayers().erase(it);
utils::LOG(utils::format("\t[%s] left !", it->second.GetName().c_str()));
}
m_Connections.erase(connexionID); m_Connections.erase(connexionID);
m_Lobby.OnPlayerLeave(connexionID); m_Lobby.OnPlayerLeave(connexionID);
OnPlayerLeave(connexionID); OnPlayerLeave(connexionID);

3
src/server/ServerConnexion.cpp
View File

@@ -22,6 +22,7 @@
#include "td/misc/Time.h" #include "td/misc/Time.h"
#include "td/misc/Random.h" #include "td/misc/Random.h"
#include "td/misc/Format.h"
#include <chrono> #include <chrono>
@@ -96,6 +97,8 @@ void ServerConnexion::HandlePacket(const protocol::PlayerLoginPacket* packet) {
if (m_Player->GetName().empty() && !packet->GetPlayerName().empty()) { if (m_Player->GetName().empty() && !packet->GetPlayerName().empty()) {
m_Player->SetName(packet->GetPlayerName()); m_Player->SetName(packet->GetPlayerName());
utils::LOG(utils::format("\t[%s] joined !", m_Player->GetName().c_str()));
protocol::PlayerJoinPacket joinPacket(m_ID, m_Player->GetName()); protocol::PlayerJoinPacket joinPacket(m_ID, m_Player->GetName());
m_Server->BroadcastPacket(&joinPacket); m_Server->BroadcastPacket(&joinPacket);