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

New CapturePointAddition fixed to work on Network by Joachim

Browse Source
This commit is contained in:
verysecrethero
2016-03-07 14:50:31 +01:00
parent 64df3fd7ad
commit 3eaad275ba
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/Server.cpp
+6 -5
View File
@@ -162,7 +162,7 @@ void Server::unreliableBroadcast(Packet& packet)
{ {
for (auto& kv : m_ConnectedPlayers) { for (auto& kv : m_ConnectedPlayers) {
packet.ChangePacketID(kv.second.PacketID); packet.ChangePacketID(kv.second.PacketID);
// m_Unreliable.Send(packet, kv.second); // m_Unreliable.Send(packet, kv.second);
} }
} }
@@ -649,13 +649,14 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
return true; return true;
} }
} }
return childEntity.HasComponent("Player") return childEntity.HasComponent("Player")
|| childEntity.FirstParentWithComponent("Player").Valid() || childEntity.FirstParentWithComponent("Player").Valid()
|| childEntity.HasComponent("CapturePoint") || childEntity.HasComponent("CapturePoint")
|| childEntity.HasComponent("HealthPickup") || childEntity.HasComponent("HealthPickup")
|| childEntity.HasComponent("AmmoPickup") || childEntity.HasComponent("AmmoPickup")
|| childEntity.HasComponent("ScoreScreen") || childEntity.HasComponent("ScoreScreen")
|| childEntity.FirstParentWithComponent("ScoreScreen").Valid(); || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
|| childEntity.FirstParentWithComponent("CapturePoint").Valid();
} }
PlayerID Server::getPlayerIDFromEndpoint() PlayerID Server::getPlayerIDFromEndpoint()
@@ -674,7 +675,7 @@ PlayerID Server::getPlayerIDFromEndpoint()
PlayerID Server::getPlayerIDFromEntityID(EntityID entityID) PlayerID Server::getPlayerIDFromEntityID(EntityID entityID)
{ {
for(auto& kv : m_ConnectedPlayers) { for (auto& kv : m_ConnectedPlayers) {
if (entityID == kv.second.EntityID) { if (entityID == kv.second.EntityID) {
return kv.first; return kv.first;
} }