Changeset 11321 for code

Timestamp:

Dec 5, 2016, 4:08:31 PM (8 years ago)

Author:

ooguz

Message:

Distance Trigger works!

Location:

code/branches/QuestGuide_HS16/src/modules/waypoints

Files:

• WaypointGroup.cc (modified) (2 diffs)
• WaypointGroup.h (modified) (2 diffs)

code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc

@@ -72 +72 @@
           if (activeWaypoint == nullptr){
             orxout() << "Null Pointer" << endl;
-            activeWaypoint = getFirst();
+            activateNext();
 
           }
@@ -89 +89 @@
 //    }
 
-    Waypoint* WaypointGroup::getFirst(){
-        std::set<Waypoint*>::iterator it = waypoints_.begin();
-        return *it;
-    }
+ //   Waypoint* WaypointGroup::getFirst(){
+ //       std::set<Waypoint*>::iterator it = waypoints_.begin();
+ //       return *it;
+ //   }
 
 

code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h

@@ -51 +51 @@
         void activateNext();
 
-        Waypoint* getFirst();
+        //Waypoint* getFirst();
 
 
@@ -64 +64 @@
         std::set<Waypoint*> waypoints_;
         Waypoint* activeWaypoint;
-        unsigned int current = 1;
+        unsigned int current = 0;
         //std::set<Waypoint*>::iterator it;