Changeset 3196 for code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
r3110 r3196 29 29 #include "LightningGunProjectile.h" 30 30 31 #include <OgreBillboardSet.h> 32 33 #include "core/GameMode.h" 31 #include "util/Convert.h" 34 32 #include "core/CoreIncludes.h" 35 #include "objects/Scene.h"36 #include "util/Convert.h"37 33 38 34 namespace orxonox … … 46 42 this->textureIndex_ = 1; 47 43 this->maxTextureIndex_ = 8; 48 this->textureTimer_.setTimer(0.01 , true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));44 this->textureTimer_.setTimer(0.01f, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture))); 49 45 50 46 registerVariables();
Note: See TracChangeset
for help on using the changeset viewer.