Changeset 8197 for code/branches/dockingsystem2/src

Timestamp:

Apr 6, 2011, 4:54:07 PM (14 years ago)

Author:

dafrick

Message:

Replacing getNick() with getName(). nick_ in HumanPlayer is only needed to synchronize the player name over the network.

Location:

code/branches/dockingsystem2/src

Files:

• modules/docking/Dock.cc (modified) (1 diff)
• orxonox/infos/HumanPlayer.h (modified) (1 diff)

code/branches/dockingsystem2/src/modules/docking/Dock.cc

@@ -113 +113 @@
             COUT(0) << "Docking::execute Player was not as human as expected.." << std::endl;
         }
-        COUT(0) << "Dock triggered by player: " << human->getNick() << ".." << std::endl;
+        COUT(0) << "Dock triggered by player: " << human->getName() << ".." << std::endl;
 
         //TODO: This is waaay too oversimplified

code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h

@@ -48 +48 @@
             float getPing() const;
             float getPacketLossRatio() const;
-
-            inline const std::string& getNick() const
-                { return this->nick_; }
 
             void setClientID(unsigned int clientID);