Changeset 10848 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.h

Timestamp:

Nov 24, 2015, 1:47:43 PM (8 years ago)

Author:

gania

Message:

still not compilable

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) (2 diffs)

code/branches/campaignHS15/src/orxonox/controllers/CommonController.h

@@ -138 +138 @@
                 static bool sameTeam (ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gt);
                 static bool isLooking( ControllableEntity* entityThatLooks, ControllableEntity* entityBeingLookedAt, float angle ) ;
-                static std::string getName( ControllableEntity* entity ) ;
+                static std::string getName( Pawn* entity ) ;
 
                 float squaredDistanceToTarget() const;
@@ -207 +207 @@
                 Rank::Value rank_;
                 std::string protectName_;
+                std::string targetName_;
                 Action::Value action_;
                 int attackRange_;