Changeset 2533 for code/branches/bugger/src/orxonox/objects/quest/QuestHint.h

Timestamp:

Dec 23, 2008, 11:34:35 PM (17 years ago)

Author:

rgrieder

Message:

Merged revisions 2384-2436 from presentation branch to bugger.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (3 diffs, 1 prop)

code/branches/bugger/src/orxonox/objects/quest/QuestHint.h

@@ -28 +28 @@
  
 /**
-    @file QuestHint.h
-    @brief
-    Definition of the QuestHint class.
+    @file
+    @brief Definition of the QuestHint class.
 */
 
@@ -44 +43 @@
 #include "QuestItem.h"
 
-namespace questHintStatus
-{
-
-    //! The status of the hint.
-    enum Enum
-    {
-        inactive,
-        active
-    };
-
-}
-
 namespace orxonox
 {
+    namespace questHintStatus
+    {
+
+        //! The state of the hint.
+        enum Enum
+        {
+            inactive,
+            active
+        };
+
+    }
 
     /**
@@ -96 +94 @@
         private:
             Quest* quest_; //!< The Quest the QuestHint belongs to.
-            std::map<const PlayerInfo*, questHintStatus::Enum> playerStatus_; //!< List of the status for each player, with the Player-pointer as key.
+            std::map<const PlayerInfo*, questHintStatus::Enum> playerStatus_; //!< List of the states for each player, with the Player-pointer as key.
 
     };