Changeset 6412 for code/branches/pickup2/src/modules/weapons/projectiles/LightningGunProjectile.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) (2 diffs)

code/branches/pickup2/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -43 +43 @@
         this->maxTextureIndex_ = 8;
         this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
-        
+
         registerVariables();
     }
-    
+
     void LightningGunProjectile::registerVariables()
     {
         registerVariable(this->materialBase_);
     }
-    
+
     void LightningGunProjectile::setMaterial(const std::string& material)
     {
-        this->materialBase_ = material;    
-    
+        this->materialBase_ = material;
+
         BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
     }
@@ -64 +64 @@
         if (this->textureIndex_ > this->maxTextureIndex_)
             this->textureIndex_ = 1;
-        
+
         this->setMaterial(this->materialBase_);
     }