Changeset 8197 for code/branches

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

Files:

• data/levels/docking.oxw (modified) (2 diffs)
• src/modules/docking/Dock.cc (modified) (1 diff)
• src/orxonox/infos/HumanPlayer.h (modified) (1 diff)

code/branches/dockingsystem2/data/levels/docking.oxw

@@ -30 +30 @@
       <SpawnPoint position="<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     <?lua end ?>
-
-
-    <Dock>
-        <effects>
-            <DockToShip />
-        </effects>
-        <events>
-            <execute>
-                <EventListener event="dockMe" />
-            </execute>
-        </events>
-        <attached>
-            <DistanceTrigger position="0,0,0" distance="20" target="Pawn" name="dockMe" />
-            <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
-        </attached>
-    </Dock>
-
-
     
     <Destroyer
@@ -61 +43 @@
 
       <attached>
+        <Dock>
+            <effects>
+                <DockToShip />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event="dockMe" />
+                </execute>
+            </events>
+            <attached>
+                <DistanceMultiTrigger position="0,0,0" distance="20" target="Pawn" name="dockMe" />
+                <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
+            </attached>
+        </Dock>
+      
         <TeamSpawnPoint team=1 position="150,0,7" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
         <TeamSpawnPoint team=1 position="0,0,7" lookat="-1,0,0" roll="90"  yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />

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);