Changeset 10848 for code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h

Timestamp:

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

Author:

gania

Message:

still not compilable

File:

• code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h (modified) (1 diff)

code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h

@@ -91 +91 @@
                 void setEnemy( ControllableEntity* enemy);
                 ControllableEntity* getEnemy();
+                std::string getName()
+                {
+                    if (actionName_ != "")
+                        return actionName_;
+                    else if (protectName_ != "")
+                        return protectName_;
+                    else if (enemyName_ != "")
+                        return enemyName_;
+                    else
+                        return "";
+                }
             //----["Waypoints" data]----
                 void setTargetPosition(const Vector3& target);