Changeset 11318 for code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.h

Timestamp:

Dec 5, 2016, 3:59:38 PM (7 years ago)

Author:

ooguz

Message:

Distance Trigger Added

File:

• code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.h (modified) (5 diffs)

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

@@ -5 +5 @@
 
 #include "OrxonoxPrereqs.h"
+#include "Waypointprereqs.h"
 #include "worldentities/StaticEntity.h"
 #include "graphics/Model.h"
@@ -14 +15 @@
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/Tickable.h"
+#include "WaypointGroup.h"
+
 
 namespace orxonox
@@ -37 +40 @@
 
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void enable_waypoint(){
@@ -51 +54 @@
             }
 
+            inline void setWaypointGroup(WaypointGroup* waypointgroup_){
+                this->waypointgroup = waypointgroup_;
+            }
+
+            void activate();
+
             
             bool waypoint_actived;
@@ -59 +68 @@
             Model* model;
             DistanceTrigger* distancetrigger;
-            int order;
-            
+            unsigned int order = 0;
+            WaypointGroup* waypointgroup;
+
             // network callbacks
     };