[Orxonox-commit 3511] r8197 - in code/branches/dockingsystem2: data/levels src/modules/docking src/orxonox/infos

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-04-06 16:54:07 +0200 (Wed, 06 Apr 2011)
New Revision: 8197

Modified:
   code/branches/dockingsystem2/data/levels/docking.oxw
   code/branches/dockingsystem2/src/modules/docking/Dock.cc
   code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h
Log:
Replacing getNick() with getName(). nick_ in HumanPlayer is only needed to synchronize the player name over the network.


Modified: code/branches/dockingsystem2/data/levels/docking.oxw
===================================================================
--- code/branches/dockingsystem2/data/levels/docking.oxw	2011-04-06 14:39:29 UTC (rev 8196)
+++ code/branches/dockingsystem2/data/levels/docking.oxw	2011-04-06 14:54:07 UTC (rev 8197)
@@ -29,24 +29,6 @@
     <?lua for i = 1, 10, 1 do ?>
       <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
       position          = "100,150,0"
@@ -60,6 +42,21 @@
     >
 
       <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 />
         <TeamSpawnPoint team=1 position="-50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />

Modified: code/branches/dockingsystem2/src/modules/docking/Dock.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/Dock.cc	2011-04-06 14:39:29 UTC (rev 8196)
+++ code/branches/dockingsystem2/src/modules/docking/Dock.cc	2011-04-06 14:54:07 UTC (rev 8197)
@@ -112,7 +112,7 @@
         if(human == NULL) {
             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
         if(bTriggered) {

Modified: code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h
===================================================================
--- code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h	2011-04-06 14:39:29 UTC (rev 8196)
+++ code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h	2011-04-06 14:54:07 UTC (rev 8197)
@@ -48,9 +48,6 @@
             float getPing() const;
             float getPacketLossRatio() const;
 
-            inline const std::string& getNick() const
-                { return this->nick_; }
-
             void setClientID(unsigned int clientID);
 
             virtual void changedGametype();