Changeset 10935 for code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h

Timestamp:

Dec 7, 2015, 3:14:40 PM (10 years ago)

Author:

gania

Message:

cleaned source up a bit

File:

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

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

@@ -170 +170 @@
             bool getDefaultPatrol ()
                 { return this->bDefaultPatrol_; }
-                 // Trigger interface
-            // bool stop(bool bTriggered, BaseObject* trigger);
-            // bool go(bool bTriggered, BaseObject* trigger);
-            // virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+               
 
             virtual void stayNearProtect();
@@ -243 +240 @@
                 void nextActionpoint();                 
             //----[Actionpoint methods]----          
-                bool bFirstTick_; 
-
-              /*  void setSpawners();
-                Vector3 bestHealthPickup (float searchRadius);
-                // Point closestPickup(PickupType::Value pickupType);
-                std::multimap <int, std::pair<PickupSpawner*, bool> > healthSpawners_; 
-                std::multimap <int, std::pair<PickupSpawner*, bool> > damageSpawners_; 
-                std::multimap <int, std::pair<PickupSpawner*, bool> > speedSpawners_; 
-*/
-                bool bActionCalled_;
-                bool bManeuverCalled_;
+
                 bool bDefaultFightAll_;
 
-                bool bActive_;
                 bool bPatrolling_;
                 bool bDefaultPatrol_;
                 bool stop_;
-                static int sTicks_;
-                static int nextActionpointControllerId_;
-                int actionpointControllerId_;
-                int ticks_;
+                static unsigned int sTicks_;     //<! a hack? I don't want action() and maneuver() to be called multiple times in a tick, so I keep
+                                        //<! track of ticks and if current tick is "assigned" to this object, than I call maneuver()/action()
+                static unsigned int nextActionpointControllerId_;    //<! if level has 16 ActionpointControllers, than this variable equals to 17 after first tick 
+                unsigned int actionpointControllerId_;   //<! integer from 0 to nextActionpointControllerId_, different for every ActionpointController in level
+                unsigned int ticks_;     //<! local tick counter