Changeset 3280 for code/trunk/src/orxonox/objects/weaponsystem

Timestamp:

Jul 12, 2009, 11:58:01 PM (15 years ago)

Author:

rgrieder

Message:

Merged most of the core4 revisions back to the trunk except for:

• orxonox_cast
• all the radical changes in the input library

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc

@@ -56 +56 @@
         this->materialBase_ = material;    
     
-        BillboardProjectile::setMaterial(material + convertToString(this->textureIndex_));
+        BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
     }
 

code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc

@@ -44 +44 @@
         if (GameMode::showsGraphics())
         {
-            this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::normal);
+            this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::Normal);
             this->attachOgreObject(this->particles_->getParticleSystem());
             this->particles_->setKeepParticlesInLocalSpace(0);