Changeset 3089 for code/trunk/src/orxonox/objects/worldentities/pawns

Timestamp:

May 27, 2009, 4:11:31 PM (16 years ago)

Author:

landauf

Message:

merged map branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/pawns/Pawn.h (modified) (1 diff)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -86 +86 @@
 
         this->registerVariables();
+
+        this->isHumanShip_ = this->hasLocalController();
     }
 
@@ -365 +367 @@
     }
 
+    //Tell the Map (RadarViewable), if this is a playership
+    void Pawn::startLocalHumanControl()
+    {
+//        SUPER(ControllableEntity, changedPlayer());
+        ControllableEntity::startLocalHumanControl();
+        this->isHumanShip_ = true;
+    }
+
 
     ///////////////////

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -112 +112 @@
             virtual void useItem()
                 { this->pickups_.useItem(); }
+            
+            virtual void startLocalHumanControl();
 
         protected: