[Orxonox-commit 6412] r11069 - in code/branches/cpp11_v3/src/modules: hover overlays/hud weapons/projectiles

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-17 18:44:19 +0100 (Sun, 17 Jan 2016)
New Revision: 11069

Modified:
   code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc
   code/branches/cpp11_v3/src/modules/hover/HoverWall.cc
   code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc
   code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc
Log:
fixed enums

Modified: code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc	2016-01-17 17:41:22 UTC (rev 11068)
+++ code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc	2016-01-17 17:44:19 UTC (rev 11069)
@@ -54,7 +54,7 @@
 
         this->enableCollisionCallback();
         this->setCollisionResponse(true);
-        this->setCollisionType(Static);
+        this->setCollisionType(CollisionType::Static);
     }
 
     /**

Modified: code/branches/cpp11_v3/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverWall.cc	2016-01-17 17:41:22 UTC (rev 11068)
+++ code/branches/cpp11_v3/src/modules/hover/HoverWall.cc	2016-01-17 17:44:19 UTC (rev 11069)
@@ -50,7 +50,7 @@
 
         this->enableCollisionCallback();
         this->setCollisionResponse(true);
-        this->setCollisionType(Static);
+        this->setCollisionType(CollisionType::Static);
     }
 
     /**

Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc	2016-01-17 17:41:22 UTC (rev 11068)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc	2016-01-17 17:44:19 UTC (rev 11069)
@@ -75,7 +75,7 @@
         this->textOverlayLeft_->setCaption("?");
         textOverlayLeft_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayLeft_->setVisible(true);
-        textOverlayLeft_->setAlignment(OverlayText::Center);
+        textOverlayLeft_->setAlignment(OverlayText::Alignment::Center);
         textOverlayLeft_->setTextSize(0.02f);
         textOverlayLeft_->setColour(ColourValue(0.21,0.70,0.21,1.0));
         textOverlayLeft_->setAspectCorrection(false);
@@ -86,7 +86,7 @@
         this->textOverlayRight_->setCaption("?");
         textOverlayRight_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayRight_->setVisible(true);
-        textOverlayRight_->setAlignment(OverlayText::Center);
+        textOverlayRight_->setAlignment(OverlayText::Alignment::Center);
         textOverlayRight_->setTextSize(0.02f);
         textOverlayRight_->setColour(ColourValue(0.21,0.70,0.21,1.0));
         textOverlayRight_->setAspectCorrection(false);

Modified: code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc	2016-01-17 17:41:22 UTC (rev 11068)
+++ code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc	2016-01-17 17:44:19 UTC (rev 11069)
@@ -120,7 +120,7 @@
             this->setAngularDamping(0.1f);
             this->enableCollisionCallback();
             this->setCollisionResponse(true);
-            this->setCollisionType(Dynamic);
+            this->setCollisionType(CollisionType::Dynamic);
 
             // Create a sphere collision shape and attach it to the projectile.
             collisionShape_ = new SphereCollisionShape(this->getContext());