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

Timestamp:

Nov 23, 2015, 3:50:59 PM (9 years ago)

Author:

gania

Message:

Gani changed something

File:

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

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

@@ -103 +103 @@
                         { return this->rank_; }
                 //----[/Rank data]----
+                //----[Protect data]----
+                    void setProtectXML( std::string val );
+                    std::string getProtectXML ();
+                    void setProtect (ControllableEntity* protect);
+                    ControllableEntity* getProtect ();
+                //----[/Protect data]----
             //----[/XML data]----
 
@@ -124 +130 @@
                 float randomInRange(float a, float b);
                 static float distance(ControllableEntity* entity1, ControllableEntity* entity2);
-                static bool sameTeam (ControllableEntity* entity1, ControllableEntity* entity2);
+                static bool sameTeam (ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gt);
                 static bool isLooking( ControllableEntity* entityThatLooks, ControllableEntity* entityBeingLookedAt, float angle ) ;
 
@@ -168 +174 @@
                 bool bHasTargetOrientation_;
                 Quaternion targetOrientation_;
-                // Vector3 destination_;
-                // bool bHasDestination;
+                
+                Vector3 destination_;
+                bool bHasDestination;
             //----[/where-to-fly information]----
-            
+            //----[protect information]----
+                WeakPtr<ControllableEntity> protect_;
+            //----[/protect information]----
             //----[who-to-kill information]----
                 WeakPtr<ControllableEntity> target_;
-                //WeakPtr<ControllableEntity> objectiveTarget_;
+                WeakPtr<ControllableEntity> enemy_;
 
                 bool bHasPositionOfTarget_;