Changeset 2349 for code/branches/questsystem3/src/orxonox/objects

Timestamp:

Dec 6, 2008, 9:46:11 PM (16 years ago)

Author:

dafrick

Message:

• Completed the message clipping method for Notifications.
• Some other minor changes…

Location:

code/branches/questsystem3/src/orxonox/objects/quest

Files:

• QuestDescription.cc (modified) (1 diff)
• QuestEffectBeacon.cc (modified) (3 diffs)
• QuestEffectBeacon.h (modified) (2 diffs)

code/branches/questsystem3/src/orxonox/objects/quest/QuestDescription.cc

@@ -129 +129 @@
         }
         
-        Notification* notification = new Notification(message, title, 10);
+        Notification* notification = new Notification(message, title, 30);
         notification->send();
         return true;

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

@@ -91 +91 @@
         SUPER(QuestEffectBeacon, processEvent, event);
     
-    SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
+        SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
     }
     
@@ -167 +167 @@
         if(activate)
         {
-        this->status_ = QuestEffectBeaconStatus::active;
-        return true;
+            this->status_ = QuestEffectBeaconStatus::active;
+            return true;
         }
         
@@ -193 +193 @@
         
         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.
-    {
-            this->status_ = QuestEffectBeaconStatus::inactive;
-    }
-        
+        if(this->getTimes() == 0) //!< Set the QuestEffectBeacon to inactive when the number of times it can be executed is reduced to 0.
+        {
+                this->status_ = QuestEffectBeaconStatus::inactive;
+        }
+            
         return true;
     }

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

@@ -64 +64 @@
     
     <QuestEffectBeacon times=n> //Where 'n' is eighter a number >= 0, which means the QuestEffectBeacon can be executed n times. Or n = -1, which means the QuestEffectBeacon can be executed an infinite number of times.
-            <effects>
-                <QuestEffect /> //A list of QuestEffects, invoked when the QuestEffectBeacon is executed, see QuestEffect for the full XML representation.
-                ...
-                <QuestEffect />
-            </effects>
-            <events>
+        <effects>
+            <QuestEffect /> //A list of QuestEffects, invoked when the QuestEffectBeacon is executed, see QuestEffect for the full XML representation.
+            ...
+            <QuestEffect />
+        </effects>
+        <events>
         <execute>
             <EventListener event=eventIdString />
@@ -103 +103 @@
         
     protected:
-            bool decrementTimes(void); //!< Decrement the number of times the QuestEffectBeacon can still be executed.
-            
-            /**
-            @brief Returns the number of times the QUestEffectBeacon can still be executed.
-            @return Returns the number of times the QUestEffectBeacon can still be executed.
-            */
-            inline const int & getTimes(void) const
-                { return this->times_; }
+        bool decrementTimes(void); //!< Decrement the number of times the QuestEffectBeacon can still be executed.
+        
+        /**
+        @brief Returns the number of times the QUestEffectBeacon can still be executed.
+        @return Returns the number of times the QUestEffectBeacon can still be executed.
+        */
+        inline const int & getTimes(void) const
+            { return this->times_; }
 
-        private:
-            static const int INFINITE = -1; //!< Constant to avoid using magic numbers.
-        
-            std::list<QuestEffect*> effects_; //!< The list of QuestEffects to be invoked on the executing player.
-            int times_; //!< Number of times the beacon can be exectued.
-            QuestEffectBeaconStatus::Enum status_; //!< The status of the QUestEffectBeacon, Can be eighter active or inactive.
-            
-            bool setTimes(const int & n); //!< Set the number of times the QuestEffectBeacon can be executed.
-            bool addEffect(QuestEffect* effect); //!< Add a QuestEffect to the QuestEffectBeacon.
-            
-            const QuestEffect* getEffect(unsigned int index) const; //!< Get the QuestEffect at a given index.
+    private:
+        static const int INFINITE = -1; //!< Constant to avoid using magic numbers.
+    
+        std::list<QuestEffect*> effects_; //!< The list of QuestEffects to be invoked on the executing player.
+        int times_; //!< Number of times the beacon can be exectued.
+        QuestEffectBeaconStatus::Enum status_; //!< The status of the QUestEffectBeacon, Can be eighter active or inactive.
+        
+        bool setTimes(const int & n); //!< Set the number of times the QuestEffectBeacon can be executed.
+        bool addEffect(QuestEffect* effect); //!< Add a QuestEffect to the QuestEffectBeacon.
+        
+        const QuestEffect* getEffect(unsigned int index) const; //!< Get the QuestEffect at a given index.
     
     };