Index: code/branches/network6/src/orxonox/ChatHistory.cc
===================================================================
--- code/branches/network6/src/orxonox/ChatHistory.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/ChatHistory.cc	(revision 7823)
@@ -82,5 +82,5 @@
 #ifndef CHATTEST
     /* get sender ID and prepend it to the message */
-    if (senderID != CLIENTID_UNKNOWN)
+    if (senderID != NETWORK_PEER_ID_UNKNOWN)
     {
       /* if we can't find anything, use "unknown" as default */
Index: code/branches/network6/src/orxonox/ChatInputHandler.cc
===================================================================
--- code/branches/network6/src/orxonox/ChatInputHandler.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/ChatInputHandler.cc	(revision 7823)
@@ -207,5 +207,5 @@
 
     /* setup player name info */
-    if (senderID != CLIENTID_UNKNOWN)
+    if (senderID != NETWORK_PEER_ID_UNKNOWN)
     {
        PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
Index: code/branches/network6/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/network6/src/orxonox/PlayerManager.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/PlayerManager.cc	(revision 7823)
@@ -45,5 +45,5 @@
         RegisterRootObject(PlayerManager);
 
-        this->getConnectedClients();
+//         this->getConnectedClients();
     }
 
Index: code/branches/network6/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/network6/src/orxonox/gamestates/GSRoot.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/gamestates/GSRoot.cc	(revision 7823)
@@ -160,5 +160,5 @@
     {
         if (!GameMode::isStandalone())
-            callStaticNetworkFunction(&TimeFactorListener::setTimeFactor, CLIENTID_UNKNOWN, factor_new);
+            callStaticNetworkFunction(&TimeFactorListener::setTimeFactor, NETWORK_PEER_ID_BROADCAST, factor_new);
     }
 }
Index: code/branches/network6/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/network6/src/orxonox/gametypes/Dynamicmatch.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/gametypes/Dynamicmatch.cc	(revision 7823)
@@ -452,5 +452,5 @@
                     if (!it->first)//in order to catch nullpointer
                         continue;
-                    if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                    if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
@@ -467,5 +467,5 @@
                        if (!it->first)//in order to catch nullpointer
                            continue;
-                       if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                       if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                            continue;
                        else if (it->second==chaser)
@@ -501,5 +501,5 @@
                     if (!it->first)//in order to catch nullpointer
                         continue;
-                    if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                    if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
@@ -516,5 +516,5 @@
                        if (!it->first)
                            continue;
-                       if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                       if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                            continue;
                        else if (it->second==chaser)
@@ -551,5 +551,5 @@
                     if (!it->first)//in order to catch nullpointer
                         continue;
-                    if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                    if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
@@ -566,5 +566,5 @@
                        if (!it->first)
                            continue;
-                       if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                       if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                            continue;
                        else if (it->second==chaser)
@@ -632,5 +632,5 @@
             for (std::map<PlayerInfo*, int>::iterator it = this->playerParty_.begin(); it != this->playerParty_.end(); ++it)
             {
-                if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                     continue;
                 this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
Index: code/branches/network6/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/network6/src/orxonox/gametypes/Gametype.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/gametypes/Gametype.cc	(revision 7823)
@@ -262,7 +262,7 @@
                         it->second.frags_++;
 
-                        if (killer->getPlayer()->getClientID() != CLIENTID_UNKNOWN)
+                        if (killer->getPlayer()->getClientID() != NETWORK_PEER_ID_UNKNOWN)
                             this->gtinfo_->sendKillMessage("You killed " + victim->getPlayer()->getName(), killer->getPlayer()->getClientID());
-                        if (victim->getPlayer()->getClientID() != CLIENTID_UNKNOWN)
+                        if (victim->getPlayer()->getClientID() != NETWORK_PEER_ID_UNKNOWN)
                             this->gtinfo_->sendDeathMessage("You were killed by " + killer->getPlayer()->getName(), victim->getPlayer()->getClientID());
                     }
Index: code/branches/network6/src/orxonox/gametypes/LastManStanding.cc
===================================================================
--- code/branches/network6/src/orxonox/gametypes/LastManStanding.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/gametypes/LastManStanding.cc	(revision 7823)
@@ -86,5 +86,5 @@
             if (it != this->players_.end())
             {
-                if (it->first->getClientID()== CLIENTID_UNKNOWN)
+                if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                     return true;
                 const std::string& message = ""; // resets Camper-Warning-message
@@ -131,5 +131,5 @@
         for (std::map<PlayerInfo*, int>::iterator it = this->playerLives_.begin(); it != this->playerLives_.end(); ++it)
         {
-            if (it->first->getClientID() == CLIENTID_UNKNOWN)
+            if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                 continue;
 
@@ -194,5 +194,5 @@
         if (it != this->players_.end())
         {
-            if (it->first->getClientID()== CLIENTID_UNKNOWN)
+            if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                 return;
             const std::string& message = ""; // resets Camper-Warning-message
@@ -249,5 +249,5 @@
                     this->inGame_[it->first]=true;
 
-                    if (it->first->getClientID()== CLIENTID_UNKNOWN)
+                    if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     int output=1+playerDelayTime_[it->first];
@@ -261,5 +261,5 @@
                     {
                         this->punishPlayer(it->first);
-                        if (it->first->getClientID()== CLIENTID_UNKNOWN)
+                        if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                             return;
                         const std::string& message = ""; // resets Camper-Warning-message
@@ -269,5 +269,5 @@
                 else if (it->second<timeRemaining/5)//Warning message
                 {
-                    if (it->first->getClientID()== CLIENTID_UNKNOWN)
+                    if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     const std::string& message = "Camper Warning! Don't forget to shoot.";
Index: code/branches/network6/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/branches/network6/src/orxonox/gametypes/TeamBaseMatch.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/gametypes/TeamBaseMatch.cc	(revision 7823)
@@ -190,5 +190,5 @@
             for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
             {
-                if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                     continue;
 
Index: code/branches/network6/src/orxonox/gametypes/UnderAttack.cc
===================================================================
--- code/branches/network6/src/orxonox/gametypes/UnderAttack.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/gametypes/UnderAttack.cc	(revision 7823)
@@ -76,5 +76,5 @@
         for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
         {
-            if (it->first->getClientID() == CLIENTID_UNKNOWN)
+            if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                 continue;
 
@@ -158,5 +158,5 @@
                 for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
                 {
-                    if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                    if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                         continue;
 
Index: code/branches/network6/src/orxonox/infos/GametypeInfo.cc
===================================================================
--- code/branches/network6/src/orxonox/infos/GametypeInfo.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/infos/GametypeInfo.cc	(revision 7823)
@@ -74,5 +74,5 @@
         if (GameMode::isMaster())
         {
-            callMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage, this->getObjectID(), CLIENTID_UNKNOWN, message);
+            callMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage, this->getObjectID(), NETWORK_PEER_ID_BROADCAST, message);
             this->dispatchAnnounceMessage(message);
         }
Index: code/branches/network6/src/orxonox/infos/HumanPlayer.cc
===================================================================
--- code/branches/network6/src/orxonox/infos/HumanPlayer.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/infos/HumanPlayer.cc	(revision 7823)
@@ -32,5 +32,5 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/GameMode.h"
-#include "network/ClientInformation.h"
+// #include "network/ClientInformation.h"
 #include "network/Host.h"
 #include "controllers/HumanController.h"
@@ -144,10 +144,12 @@
     float HumanPlayer::getPing() const
     {
-        return static_cast<float>(ClientInformation::findClient(this->getClientID())->getRTT());
+//         return static_cast<float>(ClientInformation::findClient(this->getClientID())->getRTT());
+        return 0.; //TODO: reimplement this
     }
 
     float HumanPlayer::getPacketLossRatio() const
     {
-        return static_cast<float>(ClientInformation::findClient(this->getClientID())->getPacketLoss());
+      //         return static_cast<float>(ClientInformation::findClient(this->getClientID())->getPacketLoss());
+        return 0.; //TODO: reimplement this
     }
 
Index: code/branches/network6/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/network6/src/orxonox/infos/PlayerInfo.cc	(revision 7822)
+++ code/branches/network6/src/orxonox/infos/PlayerInfo.cc	(revision 7823)
@@ -32,5 +32,5 @@
 
 #include "core/CoreIncludes.h"
-#include "network/ClientInformation.h"
+// #include "network/ClientInformation.h"
 #include "gametypes/Gametype.h"
 #include "worldentities/ControllableEntity.h"
@@ -43,5 +43,5 @@
         RegisterObject(PlayerInfo);
 
-        this->clientID_ = CLIENTID_UNKNOWN;
+        this->clientID_ = NETWORK_PEER_ID_UNKNOWN;
         this->bHumanPlayer_ = false;
         this->bLocalPlayer_ = false;
