Begun working on the issues (see #2, #3).

Projects/Gameplay/Src/DisconnectPacket.cpp

@@ -0,0 +1,25 @@
+#include "DisconnectPacket.h"
+
+DisconnectPacket::DisconnectPacket()
+{
+	clientNetworkIdentity = -1;
+	playerID = -1;
+}
+
+DisconnectPacket::~DisconnectPacket()
+{
+
+}
+
+Packet DisconnectPacket::pack()
+{
+	Packet packet(static_cast<char>(PacketType::ClientDisconnect));
+	packet << clientNetworkIdentity << playerID;
+
+	return packet;
+}
+
+void DisconnectPacket::unpack( Packet& p_packet )
+{
+	p_packet >> clientNetworkIdentity >> playerID;
+}

Projects/Gameplay/Src/DisconnectPacket.h

@@ -0,0 +1,28 @@
+#pragma once
+#include "Packetizer.h"
+
+// =======================================================================================
+//									DisconnectPacket
+// =======================================================================================
+
+///---------------------------------------------------------------------------------------
+/// \brief	Handles the packing and unpacking of DisconnectPacket
+///        
+/// # WelcomePacket
+/// Detailed description.....
+/// Created on: 14-1-2013 
+///---------------------------------------------------------------------------------------
+
+class DisconnectPacket : public Packetizer
+{
+public:
+	DisconnectPacket();
+	~DisconnectPacket();
+
+	Packet pack();
+
+	void unpack( Packet& p_packet );
+public:
+	int clientNetworkIdentity;
+	int playerID;
+};

Projects/Gameplay/Src/Gameplay.vcxproj

@@ -25,6 +25,7 @@
     <ClInclude Include="ColorTone.h" />
     <ClInclude Include="DestroyOnParticlesDeath.h" />
     <ClInclude Include="DestroyOnParticlesDeathSystem.h" />
+    <ClInclude Include="DisconnectPacket.h" />
     <ClInclude Include="EditSphereSystem.h" />
     <ClInclude Include="EditSphereUpdatePacket.h" />
     <ClInclude Include="EmpRocketLancherModuleSystem.h" />
@@ -288,6 +289,7 @@
     <ClCompile Include="DamageVisualizerSystem.cpp" />
     <ClCompile Include="DestroyOnParticlesDeath.cpp" />
     <ClCompile Include="DestroyOnParticlesDeathSystem.cpp" />
+    <ClCompile Include="DisconnectPacket.cpp" />
     <ClCompile Include="DisplayGameStats.cpp" />
     <ClCompile Include="DisplayPlayerScoreSystem.cpp" />
     <ClCompile Include="EditSphereSystem.cpp" />

Projects/Gameplay/Src/Gameplay.vcxproj.filters

@@ -822,6 +822,9 @@
     <ClInclude Include="ModuleOnChamberStartPoint.h">
       <Filter>Components\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="DisconnectPacket.h">
+      <Filter>Systems\Network\Packet Translation\Packetizer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Transform.cpp">
@@ -1405,5 +1408,8 @@
     <ClCompile Include="SoundComponent.cpp">
       <Filter>Components\Audio</Filter>
     </ClCompile>
+    <ClCompile Include="DisconnectPacket.cpp">
+      <Filter>Systems\Network\Packet Translation\Packetizer</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Projects/Gameplay/Src/PlayerSystem.cpp

@@ -1,10 +1,13 @@
 #include "PlayerSystem.h"
 #include "PlayerComponent.h"
+#include <Globals.h>
+#include <string>
+using namespace std;
 
 PlayerSystem::PlayerSystem() : EntitySystem( SystemType::PlayerSystem, 1, 
 											ComponentType::PlayerComponent)
 {
-
+	m_playerComponents.resize(MAXPLAYERS, NULL);
 }
 
 PlayerSystem::~PlayerSystem()
@@ -14,6 +17,8 @@ PlayerSystem::~PlayerSystem()
 
 PlayerComponent* PlayerSystem::getPlayerCompFromNetworkComp(NetworkSynced* p_netComponent)
 {
+
+
 	vector<Entity*> activeEntities = getActiveEntities();
 
 	Entity* player = activeEntities[p_netComponent->getPlayerID()];
@@ -36,7 +41,7 @@ void PlayerSystem::inserted( Entity* p_entity )
 		m_playerComponents.push_back(playerComponent);
 }
 
-std::string PlayerSystem::getPlayerNameFromID( int p_playerID ) const
+std::string PlayerSystem::getPlayerNameFromID( int p_playerID )
 {
 	if(p_playerID <= m_playerComponents.size()){
 		for (unsigned int i = 0; i < m_playerComponents.size(); i++)
@@ -46,5 +51,34 @@ std::string PlayerSystem::getPlayerNameFromID( int p_playerID ) const
 			}
 		}
 	}
+	//if (m_playerComps.hasValue(p_playerID))
+	//	return m_playerComps[p_playerID]->m_playerName;
 	return "";
 }
+
+void PlayerSystem::removed( Entity* p_entity )
+{
+	auto playerComponent = static_cast<PlayerComponent*>(
+		p_entity->getComponent(ComponentType::PlayerComponent) );
+
+	// Recycles the id. Note, this is only useful on the server.
+	recyclePlayerId(playerComponent->m_playerID);
+}
+//
+int PlayerSystem::createPlayerId( int p_fromNetworkOwnerId )
+{
+	return m_playerIds.add(p_fromNetworkOwnerId);
+}
+
+void PlayerSystem::recyclePlayerId( int p_playerId )
+{
+	if (m_playerIds.hasValue(p_playerId))
+		m_playerIds.removeAt(p_playerId);
+}
+
+//PlayerComponent* PlayerSystem::serverCreatePlayerComponent()
+//{
+//	PlayerComponent* playerComp = new PlayerComponent();
+//	playerComp->m_playerID		= m_playerComps.add(playerComp);
+//	return playerComp;
+//}

Projects/Gameplay/Src/PlayerSystem.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <EntitySystem.h>
 #include "NetworkSynced.h"
+#include <UniqueIndexList.h>
 
 class NetworkSynced;
 class PlayerComponent;
@@ -24,8 +25,17 @@ class PlayerSystem : public EntitySystem
 	~PlayerSystem();
 	PlayerComponent* getPlayerCompFromNetworkComp(NetworkSynced* p_netComponent);
 	const vector<PlayerComponent*>& getPlayerComponents() const;
-	string getPlayerNameFromID(int p_playerID) const;
+	string getPlayerNameFromID(int p_playerID);
 	void inserted( Entity* p_entity );
+	void removed( Entity* p_entity );
+
+	//PlayerComponent* serverCreatePlayerComponent(int p_fromNetworkOwnerId);
+
+	int createPlayerId(int p_fromNetworkOwnerId);
+	void recyclePlayerId(int p_playerId);
 private:
 	vector<PlayerComponent*> m_playerComponents;
+
+	UniqueIndexList<PlayerComponent*> m_playerComps;
+	UniqueIndexList<int> m_playerIds;
 };

Projects/Gameplay/Src/ServerWelcomeSystem.cpp

@@ -36,6 +36,7 @@
 #include "EntityCreationPacket.h"
 #include "WelcomePacket.h"
 #include "NewlyConnectedPlayerPacket.h"
+#include "DisconnectPacket.h"
 
 #include <Globals.h>
 #include "EntityFactory.h"
@@ -65,25 +66,26 @@ void ServerWelcomeSystem::processEntities( const vector<Entity*>& p_entities )
 	{
 		int id = m_server->popNewDisconnection();
 
-		for (unsigned int index = 0; index < p_entities.size(); index++)
-		{
-			NetworkSynced* netSync = static_cast<NetworkSynced*>(
-				m_world->getComponentManager()->getComponent( p_entities[index],
-					ComponentType::NetworkSynced ) );
-		}
-
-		// If a client has disconnected, then the clientinfo should be removed?
-		auto clientInfoSys = static_cast<ServerClientInfoSystem*>(
-			m_world->getSystem(SystemType::ServerClientInfoSystem));
-		vector<Entity*> clientInfoEntities = clientInfoSys->getActiveEntities();
-		for (unsigned int i = 0; i < clientInfoEntities.size(); i++)
-		{
-			auto clientInfo = static_cast<ClientInfo*>(
-				clientInfoEntities[i]->getComponent(ComponentType::ClientInfo));
-
-			if (clientInfo->id == id)
-				m_world->deleteEntity(clientInfoEntities[i]);
-		}
+		sendDisconnectPacket(id);
+		//for (unsigned int index = 0; index < p_entities.size(); index++)
+		//{
+		//	NetworkSynced* netSync = static_cast<NetworkSynced*>(
+		//		m_world->getComponentManager()->getComponent( p_entities[index],
+		//			ComponentType::NetworkSynced ) );
+		//}
+
+		//// If a client has disconnected, then the clientinfo should be removed?
+		//auto clientInfoSys = static_cast<ServerClientInfoSystem*>(
+		//	m_world->getSystem(SystemType::ServerClientInfoSystem));
+		//vector<Entity*> clientInfoEntities = clientInfoSys->getActiveEntities();
+		//for (unsigned int i = 0; i < clientInfoEntities.size(); i++)
+		//{
+		//	auto clientInfo = static_cast<ClientInfo*>(
+		//		clientInfoEntities[i]->getComponent(ComponentType::ClientInfo));
+
+		//	if (clientInfo->id == id)
+		//		m_world->deleteEntity(clientInfoEntities[i]);
+		//}
 	}
 
 	/************************************************************************/
@@ -119,7 +121,8 @@ void ServerWelcomeSystem::sendWelcomePacket(int p_newlyConnectedClientId)
 	// Give the new client its Network Identity.
 	WelcomePacket welcomePacket;
 	welcomePacket.clientNetworkIdentity = p_newlyConnectedClientId;
-	welcomePacket.playerID = m_playerSystem->getActiveEntities().size();
+	//welcomePacket.playerID = m_playerSystem->getActiveEntities().size();
+	welcomePacket.playerID = m_playerSystem->createPlayerId(p_newlyConnectedClientId);
 	m_server->unicastPacket( welcomePacket.pack(), p_newlyConnectedClientId );
 }
 
@@ -139,4 +142,11 @@ void ServerWelcomeSystem::sendBrodcastAllPlayers()
 		connectedPacket.playerName = playerComps.at(i)->m_playerName;
 		m_server->broadcastPacket( connectedPacket.pack() );
 	}
-}
+}
+
+void ServerWelcomeSystem::sendDisconnectPacket( int p_newlyDisconnectClientId )
+{
+	DisconnectPacket dcPacket;
+	dcPacket.clientNetworkIdentity = p_newlyDisconnectClientId;
+//	dcPacket.playerID = m_playerSystem->get
+}

Projects/Gameplay/Src/ServerWelcomeSystem.h

@@ -38,6 +38,7 @@ class ServerWelcomeSystem: public EntitySystem
 	void sendBrodcastAllPlayers();
 private:
 	void sendWelcomePacket(int p_newlyConnectedClientId);
+	void sendDisconnectPacket(int p_newlyDisconnectClientId);
 	void createClientInfoEntity(int p_newlyConnectedClientId);
 private:
 	TcpServer* m_server;

Projects/Util/Src/UniqueIndexList.h

@@ -26,6 +26,8 @@ class UniqueIndexList
 	T			 at(unsigned int p_index);
 	T			 operator[](unsigned int p_index);
 
+	bool		 hasValue(unsigned int p_index);
+
 	unsigned int getSize();
 
 	void		 clear();
@@ -35,8 +37,6 @@ class UniqueIndexList
 	stack<unsigned int> m_freeIndices;
 };
 
-
-
 template<class T>
 unsigned int UniqueIndexList<T>::add(T p_valueRef)
 {
@@ -79,6 +79,15 @@ T UniqueIndexList<T>::operator[](unsigned int p_index)
 	return m_list[p_index];
 }
 
+template<class T>
+bool UniqueIndexList<T>::hasValue( unsigned int p_index )
+{
+	if (p_index < m_list.size())
+		return m_list[p_index] != NULL;
+	else
+		return false;
+}
+
 template<class T>
 unsigned int UniqueIndexList<T>::getSize()
 {