Changeset 2435 for code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h

Timestamp:

Dec 14, 2008, 1:42:17 AM (15 years ago)

Author:

rgrieder

Message:

• updated msvc files
• Fixed build by including util/Integer.h in NetworkPrereqs.h instead of util/Math.h
• Fixed issue with a this pointer used in the base class c'tor initialisation
• Fixed build under windows: INFINITE seems to be a macro, defined in winbase.h. Constant was somewhere in the quest files.
• Fixed build: Only integral types can have header-file value when declared as static const. Float is not supported by the standard.
• Fixed a potential bug in Planet.cc: "if (cond) doOne; doTwo" —> missing brances (indentation was correct, so I assume there have to be brances)
• Corrected lots of indentation problems with tabs/spaces mix.
• Changed all "@file Blubb.h" to "@file": Doxygen then assumes the actual filename. This gives more flexibility.

File:

• code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) (3 diffs)

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

@@ -28 +28 @@
 
 /**
-    @file QuestEffectBeacon.h
+    @file
     @brief Definition of the QuestEffectBeacon class.
 */
@@ -39 +39 @@
 #include "orxonox/objects/worldentities/PositionableEntity.h"
 
-namespace QuestEffectBeaconStatus
+namespace orxonox
 {
+    namespace QuestEffectBeaconStatus
+    {
 
-    //! The status of the beacon, can be either active or inactive.
-    enum Enum
-    {
-        inactive,
-        active
-    };
+        //! The status of the beacon, can be either active or inactive.
+        enum Enum
+        {
+            inactive,
+            active
+        };
 
-}
-
-namespace orxonox {
+    }
 
     /**
@@ -112 +112 @@
     
         private:
-            static const int INFINITE = -1; //!< Constant to avoid using magic numbers.
+            static const int INFINITE_TIME = -1; //!< Constant to avoid using magic numbers.
             
             std::list<QuestEffect*> effects_; //!< The list of QuestEffects to be invoked on the executing player.