Changeset 11068 for code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseField.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/modules/towerdefense/TowerDefenseField.h (modified) (2 diffs)

code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseField.h

@@ -46 +46 @@
 namespace orxonox
 {
-    enum TowerDefenseFieldType
+    enum class TowerDefenseFieldType
     { 
         FREE,
@@ -64 +64 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             const bool isFree() const
-                { return type_==FREE; }
+                { return type_==TowerDefenseFieldType::FREE; }
             virtual void create(char object, char param);
             virtual void setCenterpoint(TowerDefenseCenterpoint* center);