Changeset 11068 for code/branches/cpp11_v3/src/orxonox/gametypes/Gametype.h

Timestamp:

Jan 17, 2016, 6:41:22 PM (8 years ago)

Author:

landauf

Message:

merged remaining commits from cpp11_v2 to cpp11_v3 (for some reason they were not merged in the first attempt)

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/gametypes/Gametype.h

@@ -45 +45 @@
 namespace orxonox
 {
-    namespace PlayerState
-    {
-        enum Value
-        {
-            Uninitialized,
-            Joined,
-            Alive,
-            Dead
-        };
-    }
+    enum class PlayerState
+    {
+        Uninitialized,
+        Joined,
+        Alive,
+        Dead
+    };
 
     struct Player
     {
         PlayerInfo* info_;
-        PlayerState::Value state_;
+        PlayerState state_;
         int frags_;
         int killed_;