Changeset 2385 for code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc

Timestamp:

Dec 10, 2008, 4:19:44 PM (15 years ago)

Author:

dafrick

Message:

Merged questsystem3.

File:

• code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) (4 diffs)

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

@@ -29 +29 @@
 /**
     @file QuestEffectBeacon.cc
-    @brief
-    Implementation of the QuestEffectBeacon class.
+    @brief Implementation of the QuestEffectBeacon class.
 */
 
@@ -91 +90 @@
         SUPER(QuestEffectBeacon, processEvent, event);
     
-    SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
+        SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
     }
     
@@ -145 +144 @@
             this->decrementTimes(); //!< Decrement the number of times the beacon can be used.
             return true;
-    }
-
-    return false;
+        }
+
+        return false;
     }
     
@@ -193 +192 @@
         
         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.
-    {
+        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;