Changeset 8327 for code/trunk/src/orxonox/gametypes/LastTeamStanding.cc

Timestamp:

Apr 25, 2011, 8:22:36 PM (13 years ago)

Author:

scheusso

Message:

merging network6 into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/LastTeamStanding.cc (modified) (8 diffs)

code/trunk/src/orxonox/gametypes/LastTeamStanding.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "network/NetworkPrereqs.h"
 #include "network/Host.h"
 #include "infos/PlayerInfo.h"
@@ -135 +136 @@
             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
@@ -169 +170 @@
         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
@@ -196 +197 @@
                     this->inGame_[it->first] = true;
 
-                    if (it->first->getClientID()== CLIENTID_UNKNOWN)
+                    if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     int output = 1 + (int)playerDelayTime_[it->first];
@@ -208 +209 @@
                     {
                         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
@@ -216 +217 @@
                 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.";
@@ -232 +233 @@
         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;
 
@@ -247 +248 @@
                 for (std::map<PlayerInfo*, int>::iterator it3 = this->teamnumbers_.begin(); it3 != this->teamnumbers_.end(); ++it3)
                 {
-                    if (it3->first->getClientID() == CLIENTID_UNKNOWN)
+                  if (it3->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                         continue;
                     if (it3->second == party)