BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Should now remove players from scoreboard if they disconnect

Browse Source
This commit is contained in:
Tleety
2016-03-03 23:55:52 +01:00
parent 0a21fe15dd
commit 118d61c711
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/ScoreScreenSystem.cpp
+11 -6
View File
@@ -39,7 +39,6 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
float position = 0.f; float position = 0.f;
for (auto it = m_PlayerIdentities.begin(); it != m_PlayerIdentities.end(); ++it) { for (auto it = m_PlayerIdentities.begin(); it != m_PlayerIdentities.end(); ++it) {
bool found = false; bool found = false;
for (auto child : children) { for (auto child : children) {
int ID = (int)child["ScoreIdentity"]["ID"]; int ID = (int)child["ScoreIdentity"]["ID"];
@@ -49,12 +48,14 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
(int&)entity["ScoreScreen"]["TotalIdentities"] -= 1; (int&)entity["ScoreScreen"]["TotalIdentities"] -= 1;
break; break;
} }
for (auto it = m_DisconnectedIdentities.begin(); it != m_DisconnectedIdentities.end(); ++it) { for (auto it2 = m_DisconnectedIdentities.begin(); it2 != m_DisconnectedIdentities.end(); ++it2) {
if (ID = *it) { if (ID == *it2) {
m_World->DeleteEntity(child.ID); m_World->DeleteEntity(child.ID);
(int&)entity["ScoreScreen"]["TotalIdentities"] -= 1; (int&)entity["ScoreScreen"]["TotalIdentities"] -= 1;
it = m_DisconnectedIdentities.erase(it); it2 = m_DisconnectedIdentities.erase(it2);
it = m_PlayerIdentities.erase(it);
//Remove from m_playerIdentities
break; break;
} }
} }
@@ -67,6 +68,11 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
break; break;
} }
} }
if (it == m_PlayerIdentities.end()) {
break;
}
if(found == false) { if(found == false) {
if(it->second.Team != currentTeam) { if(it->second.Team != currentTeam) {
//This player is not the same team as this scoreboard should show. //This player is not the same team as this scoreboard should show.
@@ -133,6 +139,5 @@ bool ScoreScreenSystem::OnPlayerDisconnected(const Events::PlayerDisconnected& e
{ {
//player has disconnected, remove him from list of ScoreIdentities //player has disconnected, remove him from list of ScoreIdentities
m_DisconnectedIdentities.push_back(e.PlayerID); m_DisconnectedIdentities.push_back(e.PlayerID);
m_PlayerIdentities.erase(e.PlayerID);
return 0; return 0;
} }