Changeset 8859 for code

Timestamp:

Aug 23, 2011, 12:58:21 AM (13 years ago)

Author:

landauf

Message:

fixed build for MSVC: "only static const integral data members can be initialized within a class"

Location:

code/trunk/src/modules/weapons/projectiles

Files:

• SimpleRocket.cc (modified) (4 diffs)
• SimpleRocket.h (modified) (1 diff)

code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -52 +52 @@
 namespace orxonox
 {
-
     CreateFactory(SimpleRocket);
+
+    const float SimpleRocket::FUEL_PERCENTAGE = 0.8f;
 
     SimpleRocket::SimpleRocket(BaseObject* creator)
@@ -95 +96 @@
             collisionShape->setHeight(5);
             this->attachCollisionShape(collisionShape);
-            
+
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
         }
@@ -115 +116 @@
     {
         SUPER(SimpleRocket, tick, dt);
-        
+
         if (GameMode::isMaster())
         {
@@ -167 +168 @@
     {
         BasicProjectile::setShooter(shooter);
-        
+
         this->player_ = this->getShooter()->getPlayer();
     }

code/trunk/src/modules/weapons/projectiles/SimpleRocket.h

@@ -122 +122 @@
 
         private:
-            static const float FUEL_PERCENTAGE = 0.8f; //!< Percentage of lifetime the rocket has fuel
-            
+            static const float FUEL_PERCENTAGE; //!< Percentage of lifetime the rocket has fuel
+
             Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.
             bool fuel_; //!< Bool is true while the rocket "has fuel"