Changeset 5720 for code/branches/libraries2/src/orxonox/objects/quest

Timestamp:

Aug 31, 2009, 5:03:29 PM (15 years ago)

Author:

landauf

Message:

moved overlays to modules

Location:

code/branches/libraries2/src/orxonox/objects/quest

Files:

• QuestEffectBeacon.cc (modified) (14 diffs)
• QuestEffectBeacon.h (modified) (1 diff)
• notifications/NotificationOverlay.h (modified) (1 diff)

code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "core/EventIncludes.h"
-#include "orxonox/objects/worldentities/pawns/Pawn.h"
-#include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
+#include "objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/triggers/PlayerTrigger.h"
 #include "QuestEffect.h"
 
@@ -52 +52 @@
     {
         RegisterObject(QuestEffectBeacon);
-        
+
         this->status_ = QuestEffectBeaconStatus::Active;
         this->times_ = INFINITE_TIME;
@@ -63 +63 @@
     {
     }
-    
+
     /**
     @brief
@@ -74 +74 @@
         XMLPortParam(QuestEffectBeacon, "times", setTimes, getTimes, xmlelement, mode);
         XMLPortObject(QuestEffectBeacon, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
-        
+
         COUT(3) << "New QuestEffectBeacon created." << std::endl;
     }
-    
+
     /**
     @brief
@@ -85 +85 @@
     {
         SUPER(QuestEffectBeacon, processEvent, event);
-    
+
         ORXONOX_SET_SUBCLASS_EVENT(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
     }
-    
+
     /**
     @brief
@@ -109 +109 @@
             return false;
         }
-        
+
         if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for ControllableEntities which means we cannot extract one.
         {
@@ -123 +123 @@
             return false;
         }
-        
+
         //! Extract the PlayerInfo from the ControllableEntity.
         PlayerInfo* player = pawn->getPlayer();
-        
+
         if(player == NULL)
         {
@@ -144 +144 @@
         return false;
     }
-    
+
     /**
     @brief
@@ -159 +159 @@
             return false;
         }
-        
+
         if(activate)
         {
@@ -165 +165 @@
         return true;
         }
-        
+
         this->status_ = QuestEffectBeaconStatus::Inactive;
         return true;
     }
-    
+
     /**
     @brief
@@ -186 +186 @@
             return true;
         }
-        
+
         this->times_ = this->times_ - 1; //!< Decrement number of times the QuestEffectBeacon can be executed.
         if(this->getTimes() == 0) //!< Set the QuestEffectBeacon to inactive when the number of times it can be executed is reduced to 0.
@@ -192 +192 @@
             this->status_ = QuestEffectBeaconStatus::Inactive;
         }
-        
-        return true;
-    }
-    
+
+        return true;
+    }
+
     /**
     @brief
@@ -212 +212 @@
             return false;
         }
-        
+
         this->times_ = n;
         return true;
     }
-    
+
     /**
     @brief
@@ -238 +238 @@
         return true;
     }
-    
+
     /**
     @brief

code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h

@@ -38 +38 @@
 
 #include <list>
-#include "orxonox/objects/worldentities/StaticEntity.h"
+#include "objects/worldentities/StaticEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h

@@ -39 +39 @@
 
 #include <string>
-#include "orxonox/overlays/OverlayText.h"
+#include "overlays/OverlayText.h"
 
 namespace orxonox