Changeset 5935 for code/branches/pickup/src/modules/weapons/projectiles/LightningGunProjectile.h

Timestamp:

Oct 13, 2009, 5:05:17 PM (16 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/LightningGunProjectile.h (modified) (1 diff)

code/branches/pickup/src/modules/weapons/projectiles/LightningGunProjectile.h

@@ -50 +50 @@
             unsigned int textureIndex_;
             unsigned int maxTextureIndex_;
-            Timer<LightningGunProjectile> textureTimer_;
+            Timer textureTimer_;
             std::string materialBase_;
       private: