Changeset 11287 for code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h

Timestamp:

Nov 14, 2016, 3:57:03 PM (7 years ago)

Author:

ooguz

Message:

Bugs fixed

File:

• code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h (modified) (3 diffs)

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

@@ -1 +1 @@
 
 
-#ifndef _Waypoint_H__
-#define _Waypoint_H__
+#ifndef _WaypointGroup_H__
+#define _WaypointGroup_H__
 
 #include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 #include "graphics/Model.h"
-#include "modules/objects/triggers/DistanceTrigger.h"
+#include "objects/triggers/DistanceTrigger.h"
 
 #include <map>
 #include <string>
 
+#include "core/CoreIncludes.h"
 #include "util/OgreForwardRefs.h"
-#include "tools/interfaces/Tickable.h"
-#include "Waypoints.h"
+#include "Waypoint.h"
 
 namespace orxonox
@@ -40 +40 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
+        //Waypoint* getWaypoint();
         Waypoint* getWaypoint(unsigned int index);
+        void setWaypoint(Waypoint* object);
 
-        Way
+
+        
 
 
@@ -54 +57 @@
             //virtual bool isCollisionTypeLegal(CollisionType type) const override;
          
-        std::set<Waypoint*> waypoints;
+        std::set<Waypoint*> waypoints_;
 
             // network callbacks